Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[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 f5d3efbfbeda425c8fbe1810f3cadf4dcd72bb9d..3c331c464b40750cd746cf41f9277c9428b141e6 100644 (file)
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1573,7 +1573,7 @@ sys_call_table:
        data8 sys_fchmodat
        data8 sys_faccessat
        data8 sys_pselect6
-       data8 sys_ppoll
+       data8 sys_ppoll                         // 1295
        data8 sys_unshare
        data8 sys_splice
        data8 sys_set_robust_list
@@ -1588,5 +1588,8 @@ sys_call_table:
        data8 sys_signalfd
        data8 sys_ni_syscall
        data8 sys_eventfd
+       data8 sys_timerfd_create                // 1310
+       data8 sys_timerfd_settime
+       data8 sys_timerfd_gettime
 
        .org sys_call_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls