Commit 21832247 authored by Brian Gerst's avatar Brian Gerst Committed by Ingo Molnar
Browse files

x86/syscall/x32: Move x32 syscall table 



Since commit:

  2e958a8a ("x86/entry/x32: Rename __x32_compat_sys_* to __x64_compat_sys_*")

the ABI prefix for x32 syscalls is the same as native 64-bit
syscalls.  Move the x32 syscall table to syscall_64.c

No functional changes.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20250314151220.862768-5-brgerst@gmail.com
parent 01dfb480

arch/x86/entry/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -27,4 +27,3 @@ CFLAGS_REMOVE_entry_fred.o += -pg $(CC_FLAGS_FTRACE) 
obj-$(CONFIG_X86_FRED)		+= entry_64_fred.o entry_fred.o



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

+13 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
#define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);

#define __SYSCALL_NORETURN(nr, sym) extern long __noreturn __x64_##sym(const struct pt_regs *);

#include <asm/syscalls_64.h>

#ifdef CONFIG_X86_X32_ABI

#include <asm/syscalls_x32.h>

#endif

#undef  __SYSCALL



#undef  __SYSCALL_NORETURN
@@ -37,6 +40,16 @@ long x64_sys_call(const struct pt_regs *regs, unsigned int nr) 
	}

};



#ifdef CONFIG_X86_X32_ABI

long x32_sys_call(const struct pt_regs *regs, unsigned int nr)

{

	switch (nr) {

	#include <asm/syscalls_x32.h>

	default: return __x64_sys_ni_syscall(regs);

	}

};

#endif



static __always_inline bool do_syscall_x64(struct pt_regs *regs, int nr)

{

	/*

arch/x86/entry/syscall_x32.c

deleted100644 → 0
+0 −25
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/syscall.h>



#define __SYSCALL(nr, sym) extern long __x64_##sym(const struct pt_regs *);

#define __SYSCALL_NORETURN(nr, sym) extern long __noreturn __x64_##sym(const struct pt_regs *);

#include <asm/syscalls_x32.h>

#undef  __SYSCALL



#undef  __SYSCALL_NORETURN

#define __SYSCALL_NORETURN __SYSCALL



#define __SYSCALL(nr, sym) case nr: return __x64_##sym(regs);

long x32_sys_call(const struct pt_regs *regs, unsigned int nr)

{

	switch (nr) {

	#include <asm/syscalls_x32.h>

	default: return __x64_sys_ni_syscall(regs);

	}

};