diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2021-05-10 11:53:12 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-05-12 10:49:15 +0200 |
| commit | dce0aa3b2ef28900cc4c779c59a870f1b4bdadee (patch) | |
| tree | 980389d5f1ff53772d39048f714e67f71c6994f9 | |
| parent | 3e5e7f7736b05d5fdf2cc4e0ba4f2d8bc42c630d (diff) | |
| download | linux-dce0aa3b2ef28900cc4c779c59a870f1b4bdadee.tar.bz2 | |
x86/syscall: Unconditionally prototype {ia32,x32}_sys_call_table[]
Even if these APIs are disabled, and the arrays therefore do not
exist, having the prototypes allows us to use IS_ENABLED() rather than
using #ifdefs.
If something ends up trying to actually *use* these arrays a linker
error will ensue.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210510185316.3307264-4-hpa@zytor.com
| -rw-r--r-- | arch/x86/include/asm/syscall.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h index 4e20054d7533..f6593cafdbd9 100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@ -21,13 +21,12 @@ extern const sys_call_ptr_t sys_call_table[]; #if defined(CONFIG_X86_32) #define ia32_sys_call_table sys_call_table -#endif - -#if defined(CONFIG_IA32_EMULATION) +#else +/* + * These may not exist, but still put the prototypes in so we + * can use IS_ENABLED(). + */ extern const sys_call_ptr_t ia32_sys_call_table[]; -#endif - -#ifdef CONFIG_X86_X32_ABI extern const sys_call_ptr_t x32_sys_call_table[]; #endif |