From: Brian Maly <brian.maly@oracle.com>
Date: Wed, 19 Sep 2018 03:10:29 +0000 (-0400)
Subject: Revert "x86/spec_ctrl: Only set SPEC_CTRL_IBRS_FIRMWARE if IBRS is actually in use"
X-Git-Tag: v4.1.12-124.31.3~529
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6050a29d3d13453b83ffd6f566379707b6c193cd;p=users%2Fjedix%2Flinux-maple.git

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 c9016d4d3694..1abaf122a6e8 100644
--- 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;
 }