KVM: SVM: Implement VIRT_SPEC_CTRL support for SSBD

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

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 191cfec92ec89fbe4b30677a9c8de9eee62a64e0..9704fbe0b7ad30087c3909dd760387d8b8bd4c94 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -904,7 +904,8 @@ static void init_amd(struct cpuinfo_x86 *c)
                }
        }
 
-       if (cpu_has(c, X86_FEATURE_SPEC_CTRL_SSBD))
+       if (cpu_has(c, X86_FEATURE_SPEC_CTRL_SSBD) ||
+           cpu_has(c, X86_FEATURE_VIRT_SSBD))
                set_cpu_cap(c, X86_FEATURE_SSBD);
 }