Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / include / asm-cris / unistd.h

diff --git a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h
index 6f2d924f4fd6d0f1421a46666ae81ad9c418b52f..007cb16a6b5b7cc4b59606485ecf24aaf28a9858 100644 (file)
--- a/include/asm-cris/unistd.h
+++ b/include/asm-cris/unistd.h
@@ -326,9 +326,11 @@
 #define __NR_epoll_pwait       319
 #define __NR_utimensat         320
 #define __NR_signalfd          321
-#define __NR_timerfd           322
+#define __NR_timerfd_create    322
 #define __NR_eventfd           323
 #define __NR_fallocate         324
+#define __NR_timerfd_settime    315
+#define __NR_timerfd_gettime    316
 
 #ifdef __KERNEL__
 
@@ -358,6 +360,7 @@
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
 
 /*
  * "Conditional" syscalls