Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[linux-2.6-omap-h63xx.git] / arch / ia64 / kernel / entry.S

diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 56ab156c48aed88303ddde98d6b085dd7e9ac6ea..7ef0c594f5ed9a7e618101770d6b9a5469936d69 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -534,6 +534,11 @@ GLOBAL_ENTRY(ia64_trace_syscall)
        stf.spill [r16]=f10
        stf.spill [r17]=f11
        br.call.sptk.many rp=syscall_trace_enter // give parent a chance to catch syscall args
+       cmp.lt p6,p0=r8,r0                      // check tracehook
+       adds r2=PT(R8)+16,sp                    // r2 = &pt_regs.r8
+       adds r3=PT(R10)+16,sp                   // r3 = &pt_regs.r10
+       mov r10=0
+(p6)   br.cond.sptk strace_error               // syscall failed ->
        adds r16=PT(F6)+16,sp
        adds r17=PT(F7)+16,sp
        ;;
@@ -1691,6 +1696,12 @@ sys_call_table:
        data8 sys_timerfd_create                // 1310
        data8 sys_timerfd_settime
        data8 sys_timerfd_gettime
+       data8 sys_signalfd4
+       data8 sys_eventfd2
+       data8 sys_epoll_create1                 // 1315
+       data8 sys_dup3
+       data8 sys_pipe2
+       data8 sys_inotify_init1
 
        .org sys_call_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls
 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */