-stable review patch. If anyone has any objections, please let us know.
------------------
From: David Miller <[email protected]>
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 <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
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 <asm/mxcc.h>
#include <asm/thread_info.h>
#include <asm/param.h>
+#include <asm/unistd.h>
#include <asm/asmmacro.h>
#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 <asm/auxio.h>
#include <asm/sfafsr.h>
#include <asm/pil.h>
+#include <asm/unistd.h>
#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
--