summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-09 19:32:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-10 16:28:36 +0200
commite21838dfd0844b093a92d4cdd4db836b473c912d (patch)
treefc1c11cbcb1dd87b795763c9d36b2c13cb2d86dc
parent3e4283b77107d1105a378859eb196e3ba5661270 (diff)
x86: set SPECTRE_BHI_ON as default
commit 2bb69f5fc72183e1c62547d900f560d0e9334925 upstream. Part of a merge commit from Linus that adjusted the default setting of SPECTRE_BHI_ON. Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 35ba10c28ca3..ba815ac474a1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2566,7 +2566,7 @@ config MITIGATION_RFDS
choice
prompt "Clear branch history"
depends on CPU_SUP_INTEL
- default SPECTRE_BHI_AUTO
+ default SPECTRE_BHI_ON
help
Enable BHI mitigations. BHI attacks are a form of Spectre V2 attacks
where the branch history buffer is poisoned to speculatively steer