aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 10:20:49 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 10:20:49 -0800
commitf7dd16bf3a2e7e29670051a2488d4be1895e408d (patch)
tree8778621ad8bf9bec35d285c4a7aa423609771bea /arch/sparc/kernel
parent951069e311a2a931bf7c9d838db860f90bf14c45 (diff)
parent22f01da398069e823e79f1209518f0913e05fc47 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index c51d08d218e..267ec8f6fb5 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -38,7 +38,7 @@
#define curptr g6
-#define NR_SYSCALLS 284 /* Each OS is different... */
+#define NR_SYSCALLS 299 /* Each OS is different... */
/* These are just handy. */
#define _SV save %sp, -STACKFRAME_SZ, %sp