Merge branches 'ns9x' and 'machtypes' into devel

[safe/jmp/linux-2.6] / include / asm-arm / unistd.h

diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index bfdbebe..7c57008 100644 (file)
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -376,8 +376,11 @@
 #define __NR_kexec_load                        (__NR_SYSCALL_BASE+347)
 #define __NR_utimensat                 (__NR_SYSCALL_BASE+348)
 #define __NR_signalfd                  (__NR_SYSCALL_BASE+349)
-#define __NR_timerfd                   (__NR_SYSCALL_BASE+350)
+#define __NR_timerfd_create            (__NR_SYSCALL_BASE+350)
 #define __NR_eventfd                   (__NR_SYSCALL_BASE+351)
+#define __NR_fallocate                 (__NR_SYSCALL_BASE+352)
+#define __NR_timerfd_settime           (__NR_SYSCALL_BASE+353)
+#define __NR_timerfd_gettime           (__NR_SYSCALL_BASE+354)
 
 /*
  * The following SWIs are ARM private.
@@ -441,7 +444,6 @@
 /*
  * Unimplemented (or alternatively implemented) syscalls
  */
-#define __IGNORE_sync_file_range       1
 #define __IGNORE_fadvise64_64          1
 
 #endif /* __KERNEL__ */