[PATCH] m32r: fix syscall table

This patch fixes the system call table for m32r.

The latest kernel cannot be linked for m32r, because the following
experimental syscalls doesn't exist in the prepatch kernel of bk-tree.

	* include/asm-m32r/unistd.h:
	- Remove syscalls from #285(perfctr_info) to #293(keyctl).

	* arch/m32r/kernel/entry.S: ditto.

Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index 45d8ea855d35ba305d4ae8f3116d842ffeb0ddfb..3f7f8c87ec94c699dfe7777d0530476dc3b54cf0 100644 (file)
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -993,15 +993,6 @@ ENTRY(sys_call_table)
         .long sys_mq_getsetattr
         .long sys_ni_syscall            /* reserved for kexec */
        .long sys_waitid
-       .long sys_perfctr_info
-       .long sys_vperfctr_open
-       .long sys_vperfctr_control
-       .long sys_vperfctr_unlink
-       .long sys_vperfctr_iresume
-       .long sys_vperfctr_read         /* 290 */
-       .long sys_add_key
-       .long sys_request_key
-       .long sys_keyctl
 
 syscall_table_size=(.-sys_call_table)
 

diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h
index 31aca939104fed17ae73a37e52e34289bb467e5b..a506573b7b69341e3a85efa546f230d8d1e78a30 100644 (file)
--- a/include/asm-m32r/unistd.h
+++ b/include/asm-m32r/unistd.h
@@ -294,25 +294,16 @@
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
 #define __NR_sys_kexec_load    283
 #define __NR_waitid            284
-#define __NR_perfctr_info      285
-#define __NR_vperfctr_open     (__NR_perfctr_info+1)
-#define __NR_vperfctr_control  (__NR_perfctr_info+2)
-#define __NR_vperfctr_unlink   (__NR_perfctr_info+3)
-#define __NR_vperfctr_iresume  (__NR_perfctr_info+4)
-#define __NR_vperfctr_read     (__NR_perfctr_info+5)
-#define __NR_add_key           291
-#define __NR_request_key       292
-#define __NR_keyctl            293
 
-#define NR_syscalls 294
+#define NR_syscalls 285
 
-/* user-visible error numbers are in the range -1 - -128: see
+/* user-visible error numbers are in the range -1 - -124: see
  * <asm-m32r/errno.h>
  */
 
 #define __syscall_return(type, res) \
 do { \
-       if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \
+       if ((unsigned long)(res) >= (unsigned long)(-(124 + 1))) { \
        /* Avoid using "res" which is declared to be in register r0; \
           errno might expand to a function call and clobber it.  */ \
                int __err = -(res); \