]> err.no Git - linux-2.6/blobdiff - arch/cris/arch-v10/kernel/entry.S
Merge branch 'linus' into cpus4096-for-linus
[linux-2.6] / arch / cris / arch-v10 / kernel / entry.S
index b61aedbad38fc0bf85775648d02f5ad72c60805e..3a65f322ae078061d5f63488dab7bd19e4eec4d4 100644 (file)
@@ -924,9 +924,11 @@ sys_call_table:
        .long sys_epoll_pwait
        .long sys_utimensat             /* 320 */
        .long sys_signalfd
-       .long sys_ni_syscall
+       .long sys_timerfd_create
        .long sys_eventfd
        .long sys_fallocate
+       .long sys_timerfd_settime       /* 325 */
+       .long sys_timerfd_gettime
 
         /*
          * NOTE!! This doesn't have to be exact - we just have