Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[sfrench/cifs-2.6.git] / include / asm-blackfin / unistd.h

diff --git a/include/asm-blackfin/unistd.h b/include/asm-blackfin/unistd.h
index e98167358d262a6a847bb7d791f565700b6f12e9..42955d0c439b8bb84986a177fc3e1fb0beb74fb7 100644 (file)
--- a/include/asm-blackfin/unistd.h
+++ b/include/asm-blackfin/unistd.h
@@ -265,14 +265,14 @@
                                /* 258 __NR_remap_file_pages */
 #define __NR_set_tid_address   259
 #define __NR_timer_create      260
-#define __NR_timer_settime     (__NR_timer_create+1)
-#define __NR_timer_gettime     (__NR_timer_create+2)
-#define __NR_timer_getoverrun  (__NR_timer_create+3)
-#define __NR_timer_delete      (__NR_timer_create+4)
-#define __NR_clock_settime     (__NR_timer_create+5)
-#define __NR_clock_gettime     (__NR_timer_create+6)
-#define __NR_clock_getres      (__NR_timer_create+7)
-#define __NR_clock_nanosleep   (__NR_timer_create+8)
+#define __NR_timer_settime     261
+#define __NR_timer_gettime     262
+#define __NR_timer_getoverrun  263
+#define __NR_timer_delete      264
+#define __NR_clock_settime     265
+#define __NR_clock_gettime     266
+#define __NR_clock_getres      267
+#define __NR_clock_nanosleep   268
 #define __NR_statfs64          269
 #define __NR_fstatfs64         270
 #define __NR_tgkill            271
@@ -283,11 +283,11 @@
                                /* 276 __NR_get_mempolicy */
                                /* 277 __NR_set_mempolicy */
 #define __NR_mq_open           278
-#define __NR_mq_unlink         (__NR_mq_open+1)
-#define __NR_mq_timedsend      (__NR_mq_open+2)
-#define __NR_mq_timedreceive   (__NR_mq_open+3)
-#define __NR_mq_notify         (__NR_mq_open+4)
-#define __NR_mq_getsetattr     (__NR_mq_open+5)
+#define __NR_mq_unlink         279
+#define __NR_mq_timedsend      280
+#define __NR_mq_timedreceive   281
+#define __NR_mq_notify         282
+#define __NR_mq_getsetattr     283
 #define __NR_kexec_load                284
 #define __NR_waitid            285
 #define __NR_add_key           286
@@ -361,7 +361,7 @@
 #define __NR_epoll_pwait       346
 #define __NR_utimensat         347
 #define __NR_signalfd          348
-#define __NR_timerfd           349
+#define __NR_timerfd_create    349
 #define __NR_eventfd           350
 #define __NR_pread64           351
 #define __NR_pwrite64          352
@@ -370,8 +370,10 @@
 #define __NR_get_robust_list   355
 #define __NR_fallocate         356
 #define __NR_semtimedop                357
+#define __NR_timerfd_settime   358
+#define __NR_timerfd_gettime   359
 
-#define __NR_syscall           358
+#define __NR_syscall           360
 #define NR_syscalls            __NR_syscall
 
 /* Old optional stuff no one actually uses */