--- linux-2.6.12.2/arch/alpha/kernel/systbls.S 2005-06-22 02:37:51 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/alpha/kernel/systbls.S 2005-07-02 22:38:30 +0200 @@ -447,7 +447,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 .quad sys_fstat64 - .quad sys_ni_syscall /* sys_vserver */ + .quad sys_vserver /* sys_vserver */ .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ --- linux-2.6.12.2/arch/arm/kernel/calls.S 2005-06-22 02:37:52 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/arm/kernel/calls.S 2005-07-02 22:38:30 +0200 @@ -327,6 +327,7 @@ __syscall_start: /* 310 */ .long sys_request_key .long sys_keyctl .long sys_semtimedop + .long sys_vserver __syscall_end: .rept NR_syscalls - (__syscall_end - __syscall_start) / 4 --- linux-2.6.12.2/arch/arm26/kernel/calls.S 2005-03-02 12:38:19 +0100 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/arm26/kernel/calls.S 2005-07-02 22:38:30 +0200 @@ -257,6 +257,11 @@ __syscall_start: .long sys_lremovexattr .long sys_fremovexattr .long sys_tkill + + .rept 313 - (. - __syscall_start) / 4 + .long sys_ni_syscall + .endr + .long sys_vserver /* 313 */ __syscall_end: .rept NR_syscalls - (__syscall_end - __syscall_start) / 4 --- linux-2.6.12.2/arch/i386/kernel/syscall_table.S 2005-06-22 02:37:53 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/i386/kernel/syscall_table.S 2005-07-02 22:38:30 +0200 @@ -273,7 +273,7 @@ ENTRY(sys_call_table) .long sys_tgkill /* 270 */ .long sys_utimes .long sys_fadvise64_64 - .long sys_ni_syscall /* sys_vserver */ + .long sys_vserver .long sys_mbind .long sys_get_mempolicy .long sys_set_mempolicy --- linux-2.6.12.2/arch/ia64/ia32/ia32_entry.S 2005-06-22 02:37:54 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/ia64/ia32/ia32_entry.S 2005-07-02 22:38:30 +0200 @@ -483,7 +483,7 @@ ia32_syscall_table: data8 sys_tgkill /* 270 */ data8 compat_sys_utimes data8 sys32_fadvise64_64 - data8 sys_ni_syscall + data8 sys32_vserver data8 sys_ni_syscall data8 sys_ni_syscall /* 275 */ data8 sys_ni_syscall --- linux-2.6.12.2/arch/ia64/kernel/entry.S 2005-06-22 02:37:54 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/ia64/kernel/entry.S 2005-07-02 22:38:30 +0200 @@ -1572,7 +1572,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr data8 sys_ni_syscall // reserved for kexec_load - data8 sys_ni_syscall // reserved for vserver + data8 sys_vserver data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key --- linux-2.6.12.2/arch/mips/kernel/scall32-o32.S 2005-03-02 12:38:22 +0100 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/mips/kernel/scall32-o32.S 2005-07-02 22:38:30 +0200 @@ -617,7 +617,7 @@ einval: li v0, -EINVAL sys sys_mq_timedreceive 5 sys sys_mq_notify 2 /* 4275 */ sys sys_mq_getsetattr 3 - sys sys_ni_syscall 0 /* sys_vserver */ + sys sys_vserver 3 sys sys_waitid 4 sys sys_ni_syscall 0 /* available, was setaltroot */ sys sys_add_key 5 --- linux-2.6.12.2/arch/mips/kernel/scall64-64.S 2005-03-02 12:38:22 +0100 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/mips/kernel/scall64-64.S 2005-07-02 22:38:30 +0200 @@ -443,7 +443,7 @@ sys_call_table: PTR sys_mq_timedreceive PTR sys_mq_notify PTR sys_mq_getsetattr /* 5235 */ - PTR sys_ni_syscall /* sys_vserver */ + PTR sys_vserver PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key --- linux-2.6.12.2/arch/mips/kernel/scall64-n32.S 2005-03-02 12:38:22 +0100 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/mips/kernel/scall64-n32.S 2005-07-02 22:38:30 +0200 @@ -357,7 +357,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify PTR compat_sys_mq_getsetattr - PTR sys_ni_syscall /* 6240, sys_vserver */ + PTR sys32_vserver /* 6240 */ PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key --- linux-2.6.12.2/arch/mips/kernel/scall64-o32.S 2005-03-02 12:38:22 +0100 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/mips/kernel/scall64-o32.S 2005-07-02 22:38:30 +0200 @@ -479,7 +479,7 @@ sys_call_table: PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ PTR compat_sys_mq_getsetattr - PTR sys_ni_syscall /* sys_vserver */ + PTR sys32_vserver PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ --- linux-2.6.12.2/arch/parisc/kernel/syscall_table.S 2005-06-22 02:37:56 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/parisc/kernel/syscall_table.S 2005-07-02 22:38:30 +0200 @@ -368,5 +368,16 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) ENTRY_COMP(set_mempolicy) + ENTRY_SAME(ni_syscall) + ENTRY_SAME(ni_syscall) + ENTRY_SAME(ni_syscall) /* 265 */ + ENTRY_SAME(ni_syscall) + ENTRY_SAME(ni_syscall) + ENTRY_SAME(ni_syscall) + ENTRY_SAME(ni_syscall) + ENTRY_SAME(ni_syscall) /* 270 */ + ENTRY_SAME(ni_syscall) + ENTRY_SAME(ni_syscall) + ENTRY_DIFF(vserver) /* Nothing yet */ --- linux-2.6.12.2/arch/ppc/kernel/misc.S 2005-06-22 02:37:56 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/ppc/kernel/misc.S 2005-07-02 22:38:30 +0200 @@ -1425,7 +1425,7 @@ _GLOBAL(sys_call_table) .long ppc_fadvise64_64 .long sys_ni_syscall /* 255 - rtas (used on ppc64) */ .long sys_debug_setcontext - .long sys_ni_syscall /* 257 reserved for vserver */ + .long sys_vserver .long sys_ni_syscall /* 258 reserved for new sys_remap_file_pages */ .long sys_ni_syscall /* 259 reserved for new sys_mbind */ .long sys_ni_syscall /* 260 reserved for new sys_get_mempolicy */ --- linux-2.6.12.2/arch/ppc64/kernel/misc.S 2005-06-22 02:37:58 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/ppc64/kernel/misc.S 2005-07-02 22:38:30 +0200 @@ -940,7 +940,7 @@ _GLOBAL(sys_call_table32) .llong .ppc32_fadvise64_64 /* 32bit only fadvise64_64 */ .llong .ppc_rtas /* 255 */ .llong .sys_ni_syscall /* 256 reserved for sys_debug_setcontext */ - .llong .sys_ni_syscall /* 257 reserved for vserver */ + .llong .sys32_vserver .llong .sys_ni_syscall /* 258 reserved for new sys_remap_file_pages */ .llong .compat_sys_mbind .llong .compat_sys_get_mempolicy /* 260 */ --- linux-2.6.12.2/arch/ppc64/kernel/misc.S 2005-06-22 02:37:58 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/ppc64/kernel/misc.S 2005-07-02 22:38:30 +0200 @@ -1216,7 +1216,7 @@ _GLOBAL(sys_call_table) .llong .sys_ni_syscall /* 32bit only fadvise64_64 */ .llong .ppc_rtas /* 255 */ .llong .sys_ni_syscall /* 256 reserved for sys_debug_setcontext */ - .llong .sys_ni_syscall /* 257 reserved for vserver */ + .llong .sys_vserver .llong .sys_ni_syscall /* 258 reserved for new sys_remap_file_pages */ .llong .sys_mbind .llong .sys_get_mempolicy /* 260 */ --- linux-2.6.12.2/arch/s390/kernel/syscalls.S 2005-06-22 02:37:59 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/s390/kernel/syscalls.S 2005-07-02 22:38:30 +0200 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */ SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper) -NI_SYSCALL /* reserved for vserver */ +SYSCALL(sys_vserver,sys_vserver,sys32_vserver) SYSCALL(s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) --- linux-2.6.12.2/arch/sparc/kernel/systbls.S 2004-12-25 01:54:50 +0100 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/sparc/kernel/systbls.S 2005-07-02 22:38:30 +0200 @@ -72,7 +72,7 @@ sys_call_table: /*250*/ .long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl /*255*/ .long sys_nis_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep /*260*/ .long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun -/*265*/ .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_io_setup, sys_io_destroy +/*265*/ .long sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .long sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl --- linux-2.6.12.2/arch/sparc64/kernel/systbls.S 2005-06-22 02:38:00 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/sparc64/kernel/systbls.S 2005-07-02 22:38:30 +0200 @@ -73,7 +73,7 @@ sys_call_table32: /*250*/ .word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl .word sys_ni_syscall, sys32_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun - .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy + .word sys_timer_delete, sys32_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid /*280*/ .word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl --- linux-2.6.12.2/arch/sparc64/kernel/systbls.S 2005-06-22 02:38:00 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/sparc64/kernel/systbls.S 2005-07-02 22:38:30 +0200 @@ -139,7 +139,7 @@ sys_call_table: /*250*/ .word sys64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl .word sys_ni_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun - .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_io_setup, sys_io_destroy + .word sys_timer_delete, sys_timer_create, sys_vserver, sys_io_setup, sys_io_destroy /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .word sys_nis_syscall, sys_add_key, sys_request_key, sys_keyctl --- linux-2.6.12.2/arch/x86_64/ia32/ia32entry.S 2005-06-22 02:38:01 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/arch/x86_64/ia32/ia32entry.S 2005-07-02 22:38:30 +0200 @@ -579,7 +579,7 @@ ia32_sys_call_table: .quad sys_tgkill /* 270 */ .quad compat_sys_utimes .quad sys32_fadvise64_64 - .quad quiet_ni_syscall /* sys_vserver */ + .quad sys32_vserver .quad sys_mbind .quad compat_sys_get_mempolicy /* 275 */ .quad sys_set_mempolicy --- linux-2.6.12.2/include/asm-arm26/unistd.h 2005-06-22 02:38:42 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-arm26/unistd.h 2005-07-02 22:38:30 +0200 @@ -304,6 +304,8 @@ #define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279) #define __NR_waitid (__NR_SYSCALL_BASE+280) +#define __NR_vserver (__NR_SYSCALL_BASE+313) + /* * The following SWIs are ARM private. FIXME - make appropriate for arm26 */ --- linux-2.6.12.2/include/asm-parisc/unistd.h 2005-06-22 02:38:46 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-parisc/unistd.h 2005-07-02 22:38:30 +0200 @@ -756,7 +756,9 @@ #define __NR_get_mempolicy (__NR_Linux + 261) #define __NR_set_mempolicy (__NR_Linux + 262) -#define __NR_Linux_syscalls 263 +#define __NR_vserver (__NR_Linux + 273) + +#define __NR_Linux_syscalls 273 #define HPUX_GATEWAY_ADDR 0xC0000004 #define LINUX_GATEWAY_ADDR 0x100 --- linux-2.6.12.2/include/asm-ppc/unistd.h 2005-06-22 02:38:46 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-ppc/unistd.h 2005-07-02 22:38:30 +0200 @@ -261,7 +261,7 @@ #define __NR_fadvise64_64 254 #define __NR_rtas 255 #define __NR_sys_debug_setcontext 256 -/* Number 257 is reserved for vserver */ +#define __NR_vserver 257 /* Number 258 is reserved for new sys_remap_file_pages */ /* Number 259 is reserved for new sys_mbind */ /* Number 260 is reserved for new sys_get_mempolicy */ --- linux-2.6.12.2/include/asm-ppc64/unistd.h 2005-06-22 02:38:46 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-ppc64/unistd.h 2005-07-02 22:38:30 +0200 @@ -267,7 +267,7 @@ /* #define __NR_fadvise64_64 254 32bit only */ #define __NR_rtas 255 /* Number 256 is reserved for sys_debug_setcontext */ -/* Number 257 is reserved for vserver */ +#define __NR_vserver 257 /* Number 258 is reserved for new sys_remap_file_pages */ #define __NR_mbind 259 #define __NR_get_mempolicy 260 --- linux-2.6.12.2/include/asm-s390/unistd.h 2005-06-22 02:38:47 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-s390/unistd.h 2005-07-02 22:38:30 +0200 @@ -255,7 +255,7 @@ #define __NR_clock_gettime (__NR_timer_create+6) #define __NR_clock_getres (__NR_timer_create+7) #define __NR_clock_nanosleep (__NR_timer_create+8) -/* Number 263 is reserved for vserver */ +#define __NR_vserver 263 #define __NR_fadvise64_64 264 #define __NR_statfs64 265 #define __NR_fstatfs64 266 --- linux-2.6.12.2/include/asm-sparc/unistd.h 2005-06-22 02:38:47 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-sparc/unistd.h 2005-07-02 22:38:30 +0200 @@ -283,7 +283,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 #define __NR_timer_create 266 -/* #define __NR_vserver 267 Reserved for VSERVER */ +#define __NR_vserver 267 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 --- linux-2.6.12.2/include/asm-sparc64/unistd.h 2005-06-22 02:38:47 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-sparc64/unistd.h 2005-07-02 22:38:30 +0200 @@ -285,7 +285,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 #define __NR_timer_create 266 -/* #define __NR_vserver 267 Reserved for VSERVER */ +#define __NR_vserver 267 #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 --- linux-2.6.12.2/include/asm-x86_64/unistd.h 2005-06-22 02:38:48 +0200 +++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-x86_64/unistd.h 2005-07-02 22:38:30 +0200 @@ -532,7 +532,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill) #define __NR_utimes 235 __SYSCALL(__NR_utimes, sys_utimes) #define __NR_vserver 236 -__SYSCALL(__NR_vserver, sys_ni_syscall) +__SYSCALL(__NR_vserver, sys_vserver) #define __NR_mbind 237 __SYSCALL(__NR_mbind, sys_mbind) #define __NR_set_mempolicy 238