From: Mark Huang Date: Sat, 20 Aug 2005 23:20:54 +0000 (+0000) Subject: - sync to vserver and fedora branches X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~111 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c0c84e4138de341ba5bd3050f1ccc0bace903133;p=linux-2.6.git - sync to vserver and fedora branches --- diff --git a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h index 14383aca1..cbabde4f8 100644 --- 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 */ diff --git a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h index 07c823982..84b6fa144 100644 --- 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