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 e9ac6e9dfbcb5f4d264c3b051d8a3b403f6454cc..591b0a7abfd2c10d67eb220002a24619288bd393 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2508,7 +2508,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