From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754074AbdKNJa7 (ORCPT ); Tue, 14 Nov 2017 04:30:59 -0500 Received: from mail-ot0-f194.google.com ([74.125.82.194]:50885 "EHLO mail-ot0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754054AbdKNJas (ORCPT ); Tue, 14 Nov 2017 04:30:48 -0500 X-Google-Smtp-Source: AGs4zMYmU/GDb3qr/AOuHTHIo2aMG3tsT+9LtJ6Ykqj/C5acyYzxOCWMTt916K8OG2+E9/plchhvbb0P5xTufUTy2no= MIME-Version: 1.0 In-Reply-To: <1510584031-36240-2-git-send-email-pbonzini@redhat.com> References: <1510584031-36240-1-git-send-email-pbonzini@redhat.com> <1510584031-36240-2-git-send-email-pbonzini@redhat.com> From: Wanpeng Li Date: Tue, 14 Nov 2017 17:30:47 +0800 Message-ID: Subject: Re: [PATCH 1/5] KVM: vmx: use X86_CR4_UMIP and X86_FEATURE_UMIP To: Paolo Bonzini Cc: "linux-kernel@vger.kernel.org" , kvm , Radim Krcmar Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2017-11-13 22:40 GMT+08:00 Paolo Bonzini : > 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 Reviewed-by: Wanpeng Li > --- > 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 > >