diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2017-11-13 08:23:59 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-11-17 07:20:23 -0500 |
commit | c4ad77e0d49b10b412a9fa7f47a3a23177870bc7 (patch) | |
tree | ae485dbc3fc1eaf8fd71b976f28af52a181b0c21 | |
parent | 50a671d4d15b859f447fa527191073019b6ce9cb (diff) |
KVM: vmx: use X86_CR4_UMIP and X86_FEATURE_UMIP
These bits were not defined until now in common code, but they are
now that the kernel supports UMIP too.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index be4724b5d434..0d59dbe430c8 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -9801,8 +9801,7 @@ static void nested_vmx_cr_fixed1_bits_update(struct kvm_vcpu *vcpu) | |||
9801 | cr4_fixed1_update(X86_CR4_SMEP, ebx, bit(X86_FEATURE_SMEP)); | 9801 | cr4_fixed1_update(X86_CR4_SMEP, ebx, bit(X86_FEATURE_SMEP)); |
9802 | cr4_fixed1_update(X86_CR4_SMAP, ebx, bit(X86_FEATURE_SMAP)); | 9802 | cr4_fixed1_update(X86_CR4_SMAP, ebx, bit(X86_FEATURE_SMAP)); |
9803 | cr4_fixed1_update(X86_CR4_PKE, ecx, bit(X86_FEATURE_PKU)); | 9803 | cr4_fixed1_update(X86_CR4_PKE, ecx, bit(X86_FEATURE_PKU)); |
9804 | /* TODO: Use X86_CR4_UMIP and X86_FEATURE_UMIP macros */ | 9804 | cr4_fixed1_update(X86_CR4_UMIP, ecx, bit(X86_FEATURE_UMIP)); |
9805 | cr4_fixed1_update(bit(11), ecx, bit(2)); | ||
9806 | 9805 | ||
9807 | #undef cr4_fixed1_update | 9806 | #undef cr4_fixed1_update |
9808 | } | 9807 | } |