diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 12:55:28 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 12:55:28 (GMT) |
| commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
| tree | 2636079800fa045501982a70e1be0425c1b968c2 /arch/x86/kernel/syscall_64.c | |
| parent | 6d7120a713300283a8b73e7d86cd1bab8b9d1971 (diff) | |
| parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) | |
| download | linux-fsl-qoriq-0c929238ca4baefe47f4034732db4c154f2329c6.tar.xz | |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'arch/x86/kernel/syscall_64.c')
| -rw-r--r-- | arch/x86/kernel/syscall_64.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c index de87d60..7ac7943 100644 --- a/arch/x86/kernel/syscall_64.c +++ b/arch/x86/kernel/syscall_64.c @@ -5,15 +5,11 @@ #include <linux/cache.h> #include <asm/asm-offsets.h> -#define __NO_STUBS +#define __SYSCALL_64(nr, sym, compat) extern asmlinkage void sym(void) ; +#include <asm/syscalls_64.h> +#undef __SYSCALL_64 -#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ; -#undef _ASM_X86_UNISTD_64_H -#include <asm/unistd_64.h> - -#undef __SYSCALL -#define __SYSCALL(nr, sym) [nr] = sym, -#undef _ASM_X86_UNISTD_64_H +#define __SYSCALL_64(nr, sym, compat) [nr] = sym, typedef void (*sys_call_ptr_t)(void); @@ -21,9 +17,9 @@ extern void sys_ni_syscall(void); const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = { /* - *Smells like a like a compiler bug -- it doesn't work - *when the & below is removed. - */ + * Smells like a compiler bug -- it doesn't work + * when the & below is removed. + */ [0 ... __NR_syscall_max] = &sys_ni_syscall, -#include <asm/unistd_64.h> +#include <asm/syscalls_64.h> }; |