diff options
Diffstat (limited to 'arch/x86/entry/syscall_64.c')
| -rw-r--r-- | arch/x86/entry/syscall_64.c | 25 | 
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/x86/entry/syscall_64.c b/arch/x86/entry/syscall_64.c index d5252bc1e380..b1bf31713374 100644 --- a/arch/x86/entry/syscall_64.c +++ b/arch/x86/entry/syscall_64.c @@ -10,10 +10,13 @@  /* this is a lie, but it does not hurt as sys_ni_syscall just returns -EINVAL */  extern asmlinkage long sys_ni_syscall(const struct pt_regs *);  #define __SYSCALL_64(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *); +#define __SYSCALL_X32(nr, sym, qual) __SYSCALL_64(nr, sym, qual)  #include <asm/syscalls_64.h>  #undef __SYSCALL_64 +#undef __SYSCALL_X32  #define __SYSCALL_64(nr, sym, qual) [nr] = sym, +#define __SYSCALL_X32(nr, sym, qual)  asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {  	/* @@ -23,3 +26,25 @@ asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {  	[0 ... __NR_syscall_max] = &sys_ni_syscall,  #include <asm/syscalls_64.h>  }; + +#undef __SYSCALL_64 +#undef __SYSCALL_X32 + +#ifdef CONFIG_X86_X32_ABI + +#define __SYSCALL_64(nr, sym, qual) +#define __SYSCALL_X32(nr, sym, qual) [nr] = sym, + +asmlinkage const sys_call_ptr_t x32_sys_call_table[__NR_syscall_x32_max+1] = { +	/* +	 * Smells like a compiler bug -- it doesn't work +	 * when the & below is removed. +	 */ +	[0 ... __NR_syscall_x32_max] = &sys_ni_syscall, +#include <asm/syscalls_64.h> +}; + +#undef __SYSCALL_64 +#undef __SYSCALL_X32 + +#endif  |