x86/bugs: Expose x86_spec_ctrl_base directly

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / smpboot.c

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 7defeb12694f51e451b8df32d76ca7b325d1dc33..8da06a5485ccdf1715e18e968af04e2cc8c2910f 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1700,14 +1700,14 @@ void native_play_dead(void)
        tboot_shutdown(TB_SHUTDOWN_WFS);
 
        if (ibrs_inuse)
-               native_wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_get_default());
+               native_wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base);
 
        mwait_play_dead();      /* Only returns on failure */
        if (cpuidle_play_dead())
                hlt_play_dead();
 
        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);
 }
 
 #else /* ... !CONFIG_HOTPLUG_CPU */