Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 2e7f3e257fddf9cba326fab28d769db4bdfeb055..eb4b152c82fc0d1093c6a246a9dcef4859e4eb09 100644 (file)
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -288,7 +288,7 @@
 #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_sys_kexec_load    283
+#define __NR_kexec_load                283
 #define __NR_waitid            284
 /* #define __NR_sys_setaltroot 285 */
 #define __NR_add_key           286
@@ -318,10 +318,12 @@
 #define __NR_unshare           310
 #define __NR_set_robust_list   311
 #define __NR_get_robust_list   312
-#define __NR_sys_splice                313
-#define __NR_sys_sync_file_range 314
+#define __NR_splice            313
+#define __NR_sync_file_range   314
+#define __NR_tee               315
+#define __NR_vmsplice          316
 
-#define NR_syscalls 315
+#define NR_syscalls 317
 
 /*
  * user-visible error numbers are in the range -1 - -128: see