Revert "x86/spec_ctrl: Only set SPEC_CTRL_IBRS_FIRMWARE if IBRS is actually in use"

Orabug: 28610707

This reverts commit 6a9757c562b36e32798b3e69a22295cd55ef8a69.

diff --git a/arch/x86/include/asm/spec_ctrl.h b/arch/x86/include/asm/spec_ctrl.h
index c9016d4d3694faab043d637c6b7c287cdcec4e42..1abaf122a6e8218bd65a606f8d0de9ab9c3007d2 100644 (file)
--- a/arch/x86/include/asm/spec_ctrl.h
+++ b/arch/x86/include/asm/spec_ctrl.h
@@ -337,7 +337,7 @@ static inline void clear_ibrs_disabled(void)
 
 static inline void set_ibrs_firmware(void)
 {
-       if (ibrs_supported && !ibrs_disabled)
+       if (ibrs_supported)
                use_ibrs |= SPEC_CTRL_IBRS_FIRMWARE;
 }