[SPARC]: Reserve syscall slot for VSERVER.

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index eece842924bfb684f48206796f2137a4393d58c7..d04aae13d183d99b6cad3c9889ab1108f583f83a 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -38,7 +38,7 @@
 
 #define curptr      g6
 
-#define NR_SYSCALLS 267      /* Each OS is different... */
+#define NR_SYSCALLS 268      /* Each OS is different... */
 
 /* These are just handy. */
 #define _SV    save    %sp, -STACKFRAME_SZ, %sp

diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S
index 9ecae8e15c8b7564f5d305e41e9e93486d755b97..0cd70cf7a44989edc07391968cd01b3f693d0f8f 100644 (file)
--- a/arch/sparc/kernel/systbls.S
+++ b/arch/sparc/kernel/systbls.S
@@ -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
+/*265*/        .long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_nis_syscall
 
 #ifdef CONFIG_SUNOS_EMUL
        /* Now the SunOS syscall table. */
@@ -171,6 +171,6 @@ sunos_sys_table:
        .long sunos_nosys
 /*260*/        .long sunos_nosys, sunos_nosys, sunos_nosys
        .long sunos_nosys, sunos_nosys, sunos_nosys
-       .long sunos_nosys, sunos_nosys
+       .long sunos_nosys, sunos_nosys, sunos_nosys
 
 #endif

diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 87d5ad40b3270eea3cdd298742583c920ef15ac3..ce63576d15c61878adff37781b23cedf0ea72142 100644 (file)
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -26,7 +26,7 @@
 
 #define curptr      g6
 
-#define NR_SYSCALLS 267      /* Each OS is different... */
+#define NR_SYSCALLS 268      /* Each OS is different... */
 
        .text
        .align          32

diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index d0f0b8bd55e1d2f9791378a10946de4c054dc304..3c7a3589391b5604b3027c273c89fb214c21e94a 100644 (file)
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@ -72,7 +72,7 @@ sys_call_table32:
 /*250*/        .word sys32_mremap, sys32_sysctl, sys_getsid, sys_fdatasync, sys32_nfsservctl
        .word sys_ni_syscall, compat_clock_settime, compat_clock_gettime, compat_clock_getres, compat_clock_nanosleep
 /*260*/        .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, compat_timer_settime, compat_timer_gettime, sys_timer_getoverrun
-       .word sys_timer_delete, sys32_timer_create, sys_ni_syscall
+       .word sys_timer_delete, sys32_timer_create, sys_ni_syscall, sys_ni_syscall
 
        /* Now the 64-bit native Linux syscall table. */
 
@@ -133,7 +133,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
+       .word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_ni_syscall
 
 #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \
     defined(CONFIG_SOLARIS_EMUL_MODULE)
@@ -233,5 +233,6 @@ sunos_sys_table:
        .word sunos_nosys, sunos_nosys, sunos_nosys
        .word sunos_nosys, sunos_nosys, sunos_nosys
        .word sunos_nosys, sunos_nosys, sunos_nosys
+       .word sunos_nosys
 
 #endif

diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index 06cfef2b7a8684b1d6c1b00c1241e9579de0a1a8..47c2e1e266c2dd8c5823c4bcb13459d93cd0050b 100644 (file)
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -283,7 +283,8 @@
 #define __NR_timer_getoverrun  264
 #define __NR_timer_delete      265
 #define __NR_timer_create      266
-/* WARNING: You MAY NOT add syscall numbers larger than 266, since
+/* #define __NR_vserver                267 Reserved for VSERVER */
+/* WARNING: You MAY NOT add syscall numbers larger than 267, since
  *          all of the syscall tables in the Sparc kernel are
  *          sized to have 267 entries (starting at zero).  Therefore
  *          find a free slot in the 0-266 range.

diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index 8e4d9498f9d89d958b2b466e4f455e45355cf618..f666fed20caa87943c7a9a6e06dea93510aa9c85 100644 (file)
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -285,7 +285,8 @@
 #define __NR_timer_getoverrun  264
 #define __NR_timer_delete      265
 #define __NR_timer_create      266
-/* WARNING: You MAY NOT add syscall numbers larger than 266, since
+/* #define __NR_vserver                267 Reserved for VSERVER */
+/* WARNING: You MAY NOT add syscall numbers larger than 267, since
  *          all of the syscall tables in the Sparc kernel are
  *          sized to have 267 entries (starting at zero).  Therefore
  *          find a free slot in the 0-266 range.