Skip to content

Commit 370dcd5

Browse files
Nikolay BorisovKAGA-KOKO
authored andcommitted
x86/entry: Compile entry_SYSCALL32_ignore() unconditionally
To limit the IA32 exposure on 64bit kernels while keeping the flexibility for the user to enable it when required, the compile time enable/disable via CONFIG_IA32_EMULATION is not good enough and will be complemented with a kernel command line option. Right now entry_SYSCALL32_ignore() is only compiled when CONFIG_IA32_EMULATION=n, but boot-time enable- / disablement obviously requires it to be unconditionally available. Remove the #ifndef CONFIG_IA32_EMULATION guard. Signed-off-by: Nikolay Borisov <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f71e1d2 commit 370dcd5

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

arch/x86/entry/entry_64.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,6 @@ nmi_restore:
15111511
iretq
15121512
SYM_CODE_END(asm_exc_nmi)
15131513

1514-
#ifndef CONFIG_IA32_EMULATION
15151514
/*
15161515
* This handles SYSCALL from 32-bit code. There is no way to program
15171516
* MSRs to fully disable 32-bit SYSCALL.
@@ -1522,7 +1521,6 @@ SYM_CODE_START(entry_SYSCALL32_ignore)
15221521
mov $-ENOSYS, %eax
15231522
sysretl
15241523
SYM_CODE_END(entry_SYSCALL32_ignore)
1525-
#endif
15261524

15271525
.pushsection .text, "ax"
15281526
__FUNC_ALIGN

0 commit comments

Comments
 (0)