X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fcpu%2Famd.c;h=c736bcb129017fca77963f0f71bc4e20a74fc197;hb=a93338c1757c60b6147d55f3567822334f14352a;hp=dfa858f887e8364f972d2fca4e87149d7479826a;hpb=200e837fcaaa80fe75e3c6dcb5b26fd8a168989c;p=mirror_ubuntu-artful-kernel.git

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index dfa858f887e8..c736bcb12901 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -560,8 +560,8 @@ static void bsp_init_amd(struct cpuinfo_x86 *c)
 		 * avoid RMW. If that faults, do not enable SSBD.
 		 */
 		if (!rdmsrl_safe(MSR_AMD64_LS_CFG, &x86_amd_ls_cfg_base)) {
+			setup_force_cpu_cap(X86_FEATURE_LS_CFG_SSBD);
 			setup_force_cpu_cap(X86_FEATURE_SSBD);
-			setup_force_cpu_cap(X86_FEATURE_AMD_SSBD);
 			x86_amd_ls_cfg_ssbd_mask = 1ULL << bit;
 		}
 	}
@@ -903,10 +903,8 @@ static void init_amd(struct cpuinfo_x86 *c)
 		}
 	}
 
-	if (boot_cpu_has(X86_FEATURE_AMD_SSBD)) {
+	if (cpu_has(c, X86_FEATURE_SPEC_CTRL_SSBD))
 		set_cpu_cap(c, X86_FEATURE_SSBD);
-		set_cpu_cap(c, X86_FEATURE_AMD_SSBD);
-	}
 }
 
 #ifdef CONFIG_X86_32