x86/bugs: Expose x86_spec_ctrl_base directly

[mirror_ubuntu-artful-kernel.git] / arch / x86 / include / asm / mwait.h

diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h
index 82c66546623ae003e0142ae8e470d96d666ce80e..8fac032442add4fa817ee5dbb3a1beaccb8d15f7 100644 (file)
--- a/arch/x86/include/asm/mwait.h
+++ b/arch/x86/include/asm/mwait.h
@@ -109,14 +109,14 @@ static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
                }
 
                if (ibrs_inuse)
-                       native_wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_get_default());
+                       native_wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base);
 
                __monitor((void *)&current_thread_info()->flags, 0, 0);
                if (!need_resched())
                        __mwait(eax, ecx);
 
                if (ibrs_inuse)
-                       native_wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_get_default() | SPEC_CTRL_IBRS);
+                       native_wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base | SPEC_CTRL_IBRS);
        }
        current_clr_polling();
 }