From: Chris Wright Date: Mon, 6 Nov 2006 02:49:01 +0000 (-0800) Subject: sparc syscall bump from DaveM X-Git-Tag: v2.6.18.3~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbc7b87eb33aee6ac353d12abf9c8369cb7d485f;p=thirdparty%2Fkernel%2Fstable-queue.git sparc syscall bump from DaveM --- diff --git a/queue-2.6.18/series b/queue-2.6.18/series index 470596f8d9c..ffeaff99b3f 100644 --- a/queue-2.6.18/series +++ b/queue-2.6.18/series @@ -3,3 +3,4 @@ make-alignment-exception-always-check-exception-table.patch sparc64-fix-futex_atomic_cmpxchg_inatomic-implementation.patch fix-sys_move_pages-when-a-null-node-list-is-passed.patch splice-fix-problem-introduced-with-inode-diet.patch +sparc-fix-missed-bump-of-nr_syscalls.patch diff --git a/queue-2.6.18/sparc-fix-missed-bump-of-nr_syscalls.patch b/queue-2.6.18/sparc-fix-missed-bump-of-nr_syscalls.patch new file mode 100644 index 00000000000..27ae9055c71 --- /dev/null +++ b/queue-2.6.18/sparc-fix-missed-bump-of-nr_syscalls.patch @@ -0,0 +1,77 @@ +From stable-bounces@linux.kernel.org Sun Nov 5 17:02:24 2006 +Date: Sun, 05 Nov 2006 16:58:44 -0800 (PST) +From: David Miller +To: stable@kernel.org +Subject: SPARC: Fix missed bump of NR_SYSCALLS. + +When I added the robust futex syscall entries I forgot to bump +NR_SYSCALLS. This is an easy mistake to make because NR_SYSCALLS +lived in entry.S which is nowhere near unistd.h or syscalls.S, so +while we're here move it's definition into unistd.h so this is +unlikely to ever happen again. + +Signed-off-by: David S. Miller +Signed-off-by: Chris Wright +--- + +--- + arch/sparc/kernel/entry.S | 3 +-- + arch/sparc64/kernel/entry.S | 3 +-- + include/asm-sparc/unistd.h | 2 ++ + include/asm-sparc64/unistd.h | 2 ++ + 4 files changed, 6 insertions(+), 4 deletions(-) + +--- linux-2.6.18.2.orig/arch/sparc/kernel/entry.S ++++ linux-2.6.18.2/arch/sparc/kernel/entry.S +@@ -32,13 +32,12 @@ + #include + #include + #include ++#include + + #include + + #define curptr g6 + +-#define NR_SYSCALLS 300 /* Each OS is different... */ +- + /* These are just handy. */ + #define _SV save %sp, -STACKFRAME_SZ, %sp + #define _RS restore +--- linux-2.6.18.2.orig/arch/sparc64/kernel/entry.S ++++ linux-2.6.18.2/arch/sparc64/kernel/entry.S +@@ -22,11 +22,10 @@ + #include + #include + #include ++#include + + #define curptr g6 + +-#define NR_SYSCALLS 300 /* Each OS is different... */ +- + .text + .align 32 + +--- linux-2.6.18.2.orig/include/asm-sparc/unistd.h ++++ linux-2.6.18.2/include/asm-sparc/unistd.h +@@ -319,6 +319,8 @@ + #define __NR_set_robust_list 300 + #define __NR_get_robust_list 301 + ++#define NR_SYSCALLS 302 ++ + #ifdef __KERNEL__ + /* WARNING: You MAY NOT add syscall numbers larger than 301, since + * all of the syscall tables in the Sparc kernel are +--- linux-2.6.18.2.orig/include/asm-sparc64/unistd.h ++++ linux-2.6.18.2/include/asm-sparc64/unistd.h +@@ -321,6 +321,8 @@ + #define __NR_set_robust_list 300 + #define __NR_get_robust_list 301 + ++#define NR_SYSCALLS 302 ++ + #ifdef __KERNEL__ + /* WARNING: You MAY NOT add syscall numbers larger than 301, since + * all of the syscall tables in the Sparc kernel are