diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2021-05-17 16:38:11 +0900 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-05-20 15:03:59 +0200 |
| commit | 44fe4895f47cbe9f4692e1d3cdc2ef8352f4d88e (patch) | |
| tree | 5b70fc99145f4d243730428dcaf587109c9e8b7a /arch/x86/entry/syscall_32.c | |
| parent | 6218d0f6b8dece1f2e82f0a47a0e6b8ecb631ef6 (diff) | |
x86/syscalls: Stop filling syscall arrays with *_sys_ni_syscall
This is a follow-up cleanup after switching to the generic syscalltbl.sh.
The old x86 specific script skipped non-existing syscalls. So, the
generated syscalls_64.h, for example, had a big hole in the syscall numbers
335-423 range. That is why there exists [0 ... __NR_*_syscall_max] =
&__*_sys_ni_cyscall.
The new script, scripts/syscalltbl.sh automatically fills holes
with __SYSCALL(<nr>, sys_ni_syscall), hence such ugly code can
go away. The designated initializers, '[nr] =' are also unneeded.
Also, there is no need to give __NR_*_syscall_max+1 because the array
size is implied by the number of syscalls in the generated headers.
Hence, there is no need to include <asm/unistd.h>, either.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210517073815.97426-4-masahiroy@kernel.org
Diffstat (limited to 'arch/x86/entry/syscall_32.c')
| -rw-r--r-- | arch/x86/entry/syscall_32.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/entry/syscall_32.c b/arch/x86/entry/syscall_32.c index 70bf46e73b1c..8cfc9bc73e7f 100644 --- a/arch/x86/entry/syscall_32.c +++ b/arch/x86/entry/syscall_32.c @@ -5,7 +5,6 @@ #include <linux/sys.h> #include <linux/cache.h> #include <linux/syscalls.h> -#include <asm/unistd.h> #include <asm/syscall.h> #ifdef CONFIG_IA32_EMULATION @@ -19,13 +18,8 @@ #include <asm/syscalls_32.h> #undef __SYSCALL -#define __SYSCALL(nr, sym) [nr] = __ia32_##sym, +#define __SYSCALL(nr, sym) __ia32_##sym, -__visible const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = { - /* - * Smells like a compiler bug -- it doesn't work - * when the & below is removed. - */ - [0 ... __NR_ia32_syscall_max] = &__ia32_sys_ni_syscall, +__visible const sys_call_ptr_t ia32_sys_call_table[] = { #include <asm/syscalls_32.h> }; |