diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2018-04-05 11:53:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-04-05 16:59:38 +0200 |
| commit | f8781c4a226319fe60e652118b90cf094ccfe747 (patch) | |
| tree | 1c496211debfc33f955021c62898da4c08f052cd /arch/x86/entry/common.c | |
| parent | ebeb8c82ffaf94435806ff0b686fffd41dd410b5 (diff) | |
| download | linux-f8781c4a226319fe60e652118b90cf094ccfe747.tar.gz linux-f8781c4a226319fe60e652118b90cf094ccfe747.tar.bz2 linux-f8781c4a226319fe60e652118b90cf094ccfe747.zip | |
syscalls/x86: Unconditionally enable 'struct pt_regs' based syscalls on x86_64
Removing CONFIG_SYSCALL_PTREGS from arch/x86/Kconfig and simply selecting
ARCH_HAS_SYSCALL_WRAPPER unconditionally on x86-64 allows us to simplify
several codepaths.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20180405095307.3730-7-linux@dominikbrodowski.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/common.c')
| -rw-r--r-- | arch/x86/entry/common.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 425f798b39e3..fbf6a6c3fd2d 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -284,13 +284,7 @@ __visible void do_syscall_64(unsigned long nr, struct pt_regs *regs) nr &= __SYSCALL_MASK; if (likely(nr < NR_syscalls)) { nr = array_index_nospec(nr, NR_syscalls); -#ifdef CONFIG_SYSCALL_PTREGS regs->ax = sys_call_table[nr](regs); -#else - regs->ax = sys_call_table[nr]( - regs->di, regs->si, regs->dx, - regs->r10, regs->r8, regs->r9); -#endif } syscall_return_slowpath(regs); @@ -325,7 +319,7 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs) if (likely(nr < IA32_NR_syscalls)) { nr = array_index_nospec(nr, IA32_NR_syscalls); -#ifdef CONFIG_SYSCALL_PTREGS +#ifdef CONFIG_IA32_EMULATION regs->ax = ia32_sys_call_table[nr](regs); #else /* @@ -338,7 +332,7 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs) (unsigned int)regs->bx, (unsigned int)regs->cx, (unsigned int)regs->dx, (unsigned int)regs->si, (unsigned int)regs->di, (unsigned int)regs->bp); -#endif /* CONFIG_SYSCALL_PTREGS */ +#endif /* CONFIG_IA32_EMULATION */ } syscall_return_slowpath(regs); |