diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-06-02 11:17:24 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-23 11:04:23 -0700 |
commit | dfa169bbee00671288df25f8ef8a2f6e13fe2581 (patch) | |
tree | 83b9161f5764953ab2a9d2de1c6b81411b460270 /arch/x86/kvm/cpuid.c | |
parent | 58cd71b4747432b0ef3b86db1b09c12e6c97204b (diff) | |
download | linux-stable-dfa169bbee00671288df25f8ef8a2f6e13fe2581.tar.gz linux-stable-dfa169bbee00671288df25f8ef8a2f6e13fe2581.tar.bz2 linux-stable-dfa169bbee00671288df25f8ef8a2f6e13fe2581.zip |
Revert "KVM: x86: add pcommit support"
This reverts commit 8b3e34e46aca9b6d349b331cd9cf71ccbdc91b2e.
Given the deprecation of the pcommit instruction, the relevant VMX
features and CPUID bits are not going to be rolled into the SDM. Remove
their usage from KVM.
Cc: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/x86/kvm/cpuid.c')
-rw-r--r-- | arch/x86/kvm/cpuid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 7597b42a8a88..643565364497 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -366,7 +366,7 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, F(FSGSBASE) | F(BMI1) | F(HLE) | F(AVX2) | F(SMEP) | F(BMI2) | F(ERMS) | f_invpcid | F(RTM) | f_mpx | F(RDSEED) | F(ADX) | F(SMAP) | F(AVX512F) | F(AVX512PF) | F(AVX512ER) | - F(AVX512CD) | F(CLFLUSHOPT) | F(CLWB) | F(PCOMMIT); + F(AVX512CD) | F(CLFLUSHOPT) | F(CLWB); /* cpuid 0xD.1.eax */ const u32 kvm_cpuid_D_1_eax_x86_features = |