[PATCH] x86/KVM: Fix incorrect SSBD bit in kvm_cpuid_7_0_edx_x86_features

From: Waiman Long
Date: Fri May 25 2018 - 13:16:52 EST


As the SSBD bit in kvm_cpuid_7_0_edx_x86_features has been renamed to
SPEC_CTRL_SSBD in the commit 52817587e706 ("x86/cpufeatures: Disentangle
SSBD enumeration"). The corresponding name change needed to be made in
the KVM code as well.

Fixes: 52817587e706 ("x86/cpufeatures: Disentangle SSBD enumeration")

Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
---
arch/x86/kvm/cpuid.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index ced8511..598461e 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -407,8 +407,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,

/* cpuid 7.0.edx*/
const u32 kvm_cpuid_7_0_edx_x86_features =
- F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) | F(SSBD) |
- F(ARCH_CAPABILITIES);
+ F(AVX512_4VNNIW) | F(AVX512_4FMAPS) | F(SPEC_CTRL) |
+ F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES);

/* all calls to cpuid_count() should be made on the same cpu */
get_cpu();
--
1.8.3.1