Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

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

diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index 0decdf76371640a45b5fcf43cdb39c862da8f93a..2338a027637705052632b6c535170bc05ca5e312 100644 (file)
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -327,11 +327,13 @@
 #define __NR_epoll_pwait       309
 #define __NR_utimensat         310
 #define __NR_signalfd          311
-#define __NR_timerfd           312
+#define __NR_timerfd_create    312
 #define __NR_eventfd           313
 #define __NR_fallocate         314
+#define __NR_timerfd_settime   315
+#define __NR_timerfd_gettime   316
 
-#define NR_SYSCALLS            315
+#define NR_SYSCALLS            317
 
 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,
  * it never had the plain ones and there is no value to adding those