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>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b3cd308d7d25cc57b8fc53980a8e4bb7455ff478..b4e6859542a39517a5cbf474ff892aa7ea76c65b 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2569,7 +2569,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