- sync to vserver and fedora branches

diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h
index 14383ac..cbabde4 100644 (file)
--- a/include/asm-m68k/unistd.h
+++ b/include/asm-m68k/unistd.h
@@ -280,14 +280,12 @@
 #define __NR_mq_notify         275
 #define __NR_mq_getsetattr     276
 #define __NR_waitid            277
-#warning __NR_vserver is likely the wrong number
 #define __NR_vserver           278
 #define __NR_add_key           279
 #define __NR_request_key       280
 #define __NR_keyctl            281
-#define __NR_vserver           282
 
-#define NR_syscalls            283
+#define NR_syscalls            282
 
 /* user-visible error numbers are in the range -1 - -124: see
    <asm-m68k/errno.h> */

diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h
index 07c8239..84b6fa1 100644 (file)
--- a/include/asm-m68knommu/unistd.h
+++ b/include/asm-m68knommu/unistd.h
@@ -276,8 +276,6 @@
 #define __NR_set_mempolicy     270
 #define __NR_mq_open           271
 #define __NR_mq_unlink         272
-#warning __NR_vserver is the wrong number
-#define __NR_vserver           273
 #define __NR_mq_timedsend      273
 #define __NR_mq_timedreceive   274
 #define __NR_mq_notify         275
@@ -287,7 +285,7 @@
 #define __NR_add_key           279
 #define __NR_request_key       280
 #define __NR_keyctl            281
-
+ 
 #define NR_syscalls            282
 
 /* user-visible error numbers are in the range -1 - -122: see