diff options
Diffstat (limited to 'arch/powerpc/kernel/systbl.S')
| -rw-r--r-- | arch/powerpc/kernel/systbl.S | 52 |
1 files changed, 12 insertions, 40 deletions
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index 0fa84e1ed462..23265a28740b 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S @@ -16,28 +16,6 @@ #include <asm/ppc_asm.h> -#ifdef CONFIG_PPC64 -#define SYSCALL(func) .8byte DOTSYM(sys_##func) -#define COMPAT_SYS(func) .8byte DOTSYM(sys_##func) -#define PPC_SYS(func) .8byte DOTSYM(ppc_##func) -#define OLDSYS(func) .8byte DOTSYM(sys_ni_syscall) -#define SYS32ONLY(func) .8byte DOTSYM(sys_ni_syscall) -#define PPC64ONLY(func) .8byte DOTSYM(ppc_##func) -#define SYSX(f, f3264, f32) .8byte DOTSYM(f) -#else -#define SYSCALL(func) .long sys_##func -#define COMPAT_SYS(func) .long sys_##func -#define PPC_SYS(func) .long ppc_##func -#define OLDSYS(func) .long sys_##func -#define SYS32ONLY(func) .long sys_##func -#define PPC64ONLY(func) .long sys_ni_syscall -#define SYSX(f, f3264, f32) .long f32 -#endif -#define SYSCALL_SPU(func) SYSCALL(func) -#define COMPAT_SYS_SPU(func) COMPAT_SYS(func) -#define COMPAT_SPU_NEW(func) COMPAT_SYS(func) -#define SYSX_SPU(f, f3264, f32) SYSX(f, f3264, f32) - .section .rodata,"a" #ifdef CONFIG_PPC64 @@ -46,27 +24,21 @@ .globl sys_call_table sys_call_table: -#include <asm/systbl.h> - -#undef SYSCALL -#undef COMPAT_SYS -#undef PPC_SYS -#undef OLDSYS -#undef SYS32ONLY -#undef PPC64ONLY -#undef SYSX +#ifdef CONFIG_PPC64 +#define __SYSCALL(nr, entry, nargs) .8byte DOTSYM(entry) +#include <asm/syscall_table_64.h> +#undef __SYSCALL +#else +#define __SYSCALL(nr, entry, nargs) .long entry +#include <asm/syscall_table_32.h> +#undef __SYSCALL +#endif #ifdef CONFIG_COMPAT -#define SYSCALL(func) .8byte DOTSYM(sys_##func) -#define COMPAT_SYS(func) .8byte DOTSYM(compat_sys_##func) -#define PPC_SYS(func) .8byte DOTSYM(ppc_##func) -#define OLDSYS(func) .8byte DOTSYM(sys_ni_syscall) -#define SYS32ONLY(func) .8byte DOTSYM(compat_sys_##func) -#define PPC64ONLY(func) .8byte DOTSYM(sys_ni_syscall) -#define SYSX(f, f3264, f32) .8byte DOTSYM(f3264) - .globl compat_sys_call_table compat_sys_call_table: #define compat_sys_sigsuspend sys_sigsuspend -#include <asm/systbl.h> +#define __SYSCALL(nr, entry, nargs) .8byte DOTSYM(entry) +#include <asm/syscall_table_c32.h> +#undef __SYSCALL #endif |