2017-11-13 22:40 GMT+08:00 Paolo Bonzini <pbonzini@xxxxxxxxxx>: > 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@xxxxxxxxxx> Reviewed-by: Wanpeng Li <wanpeng.li@xxxxxxxxxxx> > --- > arch/x86/kvm/vmx.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index a6f4f095f8f4..8917e100ddeb 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -9732,8 +9732,7 @@ static void nested_vmx_cr_fixed1_bits_update(struct kvm_vcpu *vcpu) > cr4_fixed1_update(X86_CR4_SMEP, ebx, bit(X86_FEATURE_SMEP)); > cr4_fixed1_update(X86_CR4_SMAP, ebx, bit(X86_FEATURE_SMAP)); > cr4_fixed1_update(X86_CR4_PKE, ecx, bit(X86_FEATURE_PKU)); > - /* TODO: Use X86_CR4_UMIP and X86_FEATURE_UMIP macros */ > - cr4_fixed1_update(bit(11), ecx, bit(2)); > + cr4_fixed1_update(X86_CR4_UMIP, ecx, bit(X86_FEATURE_UMIP)); > > #undef cr4_fixed1_update > } > -- > 1.8.3.1 > >
