Commit 2e487c35 authored by Brian Gerst's avatar Brian Gerst Committed by Thomas Gleixner
Browse files

x86/entry/64: Split X32 syscall table into its own file 



Since X32 has its own syscall table now, move it to a separate file.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Link: https://lkml.kernel.org/r/20200313195144.164260-8-brgerst@gmail.com
parent cc42c045

arch/x86/entry/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,4 +14,5 @@ obj-y += vdso/ 
obj-y				+= vsyscall/



obj-$(CONFIG_IA32_EMULATION)	+= entry_64_compat.o syscall_32.o

obj-$(CONFIG_X86_X32_ABI)	+= syscall_x32.o

arch/x86/entry/syscall_64.c

+2 −25
Original line number Diff line number Diff line
@@ -8,14 +8,13 @@ 
#include <asm/asm-offsets.h>

#include <asm/syscall.h>



#define __SYSCALL_X32(nr, sym, qual)



#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] = {

	/*
@@ -25,25 +24,3 @@ asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = { 
	[0 ... __NR_syscall_max] = &__x64_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] = &__x64_sys_ni_syscall,

#include <asm/syscalls_64.h>

};



#undef __SYSCALL_64

#undef __SYSCALL_X32



#endif

arch/x86/entry/syscall_x32.c

0 → 100644
+26 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* System call table for x32 ABI. */



#include <linux/linkage.h>

#include <linux/sys.h>

#include <linux/cache.h>

#include <linux/syscalls.h>

#include <asm/asm-offsets.h>

#include <asm/syscall.h>



#define __SYSCALL_64(nr, sym, qual)



#define __SYSCALL_X32(nr, sym, qual) extern asmlinkage long sym(const struct pt_regs *);

#include <asm/syscalls_64.h>

#undef __SYSCALL_X32



#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] = &__x64_sys_ni_syscall,

#include <asm/syscalls_64.h>

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE