diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-23 18:01:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-23 18:01:31 -0700 |
| commit | c5a3d3c01e90e74166f95eec9db6fcc3ba72a9d6 (patch) | |
| tree | 3f938013952aaf28beab3e6228a4c4e5aa90badf /arch/x86/Kconfig | |
| parent | 3a755ebcc2557e22b895b8976257f682c653db1d (diff) | |
| parent | 2147c438fde135d6c145a96e373d9348e7076f7f (diff) | |
| download | linux-c5a3d3c01e90e74166f95eec9db6fcc3ba72a9d6.tar.bz2 | |
Merge tag 'x86_cpu_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 CPU feature updates from Borislav Petkov:
- Remove a bunch of chicken bit options to turn off CPU features which
are not really needed anymore
- Misc fixes and cleanups
* tag 'x86_cpu_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/speculation: Add missing prototype for unpriv_ebpf_notify()
x86/pm: Fix false positive kmemleak report in msr_build_context()
x86/speculation/srbds: Do not try to turn mitigation off when not supported
x86/cpu: Remove "noclflush"
x86/cpu: Remove "noexec"
x86/cpu: Remove "nosmep"
x86/cpu: Remove CONFIG_X86_SMAP and "nosmap"
x86/cpu: Remove "nosep"
x86/cpu: Allow feature bit names from /proc/cpuinfo in clearcpuid=
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d90a33e96517..84a3a52ed3a0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1831,17 +1831,6 @@ config ARCH_RANDOM If supported, this is a high bandwidth, cryptographically secure hardware random number generator. -config X86_SMAP - def_bool y - prompt "Supervisor Mode Access Prevention" if EXPERT - help - Supervisor Mode Access Prevention (SMAP) is a security - feature in newer Intel processors. There is a small - performance cost if this enabled and turned on; there is - also a small increase in the kernel size if this is enabled. - - If unsure, say Y. - config X86_UMIP def_bool y prompt "User Mode Instruction Prevention" if EXPERT |