2 files changed, 2 insertions, 13 deletions

diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index 8d9deec00de9..8b38df98548e 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -217,8 +217,6 @@ enum spectre_v2_mitigation {
         SPECTRE_V2_IBRS,
 };
 
-extern void x86_spec_ctrl_set(u64);
-
 /* The Speculative Store Bypass disable variants */
 enum ssb_mitigation {
         SPEC_STORE_BYPASS_NONE,
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 00f51deba493..e0b2e3b3301e 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -133,15 +133,6 @@ static const char *spectre_v2_strings[] = {
 static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init =
         SPECTRE_V2_NONE;
 
-void x86_spec_ctrl_set(u64 val)
-{
-        if (val & x86_spec_ctrl_mask)
-                WARN_ONCE(1, "SPEC_CTRL MSR value 0x%16llx is unknown.\n", val);
-        else
-                wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base | val);
-}
-EXPORT_SYMBOL_GPL(x86_spec_ctrl_set);
-
 void
 x86_virt_spec_ctrl(u64 guest_spec_ctrl, u64 guest_virt_spec_ctrl, bool setguest)
 {
@@ -503,7 +494,7 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void)
                 case X86_VENDOR_INTEL:
                         x86_spec_ctrl_base |= SPEC_CTRL_SSBD;
                         x86_spec_ctrl_mask &= ~SPEC_CTRL_SSBD;
-                        x86_spec_ctrl_set(SPEC_CTRL_SSBD);
+                        wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base);
                         break;
                 case X86_VENDOR_AMD:
                         x86_amd_ssb_disable();
@@ -615,7 +606,7 @@ int arch_prctl_spec_ctrl_get(struct task_struct *task, unsigned long which)
 void x86_spec_ctrl_setup_ap(void)
 {
         if (boot_cpu_has(X86_FEATURE_MSR_SPEC_CTRL))
-                x86_spec_ctrl_set(x86_spec_ctrl_base & ~x86_spec_ctrl_mask);
+                wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base);
 
         if (ssb_mode == SPEC_STORE_BYPASS_DISABLE)
                 x86_amd_ssb_disable();