From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH] KVM: x86: Replace X86_FEATURE_NX offset with the definition Date: Wed, 20 Aug 2014 15:54:40 +0200 Message-ID: <53F4A8A0.3080404@redhat.com> References: <1408541899-9482-1-git-send-email-namit@cs.technion.ac.il> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, nadav.amit@gmail.com To: Nadav Amit Return-path: Received: from mx1.redhat.com ([209.132.183.28]:18554 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751240AbaHTNys (ORCPT ); Wed, 20 Aug 2014 09:54:48 -0400 In-Reply-To: <1408541899-9482-1-git-send-email-namit@cs.technion.ac.il> Sender: kvm-owner@vger.kernel.org List-ID: Il 20/08/2014 15:38, Nadav Amit ha scritto: > Replace reference to X86_FEATURE_NX using bit shift with the defined > X86_FEATURE_NX. > > Signed-off-by: Nadav Amit > --- > 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 38a0afe..f4bad87 100644 > --- a/arch/x86/kvm/cpuid.c > +++ b/arch/x86/kvm/cpuid.c > @@ -112,8 +112,8 @@ static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu) > break; > } > } > - if (entry && (entry->edx & (1 << 20)) && !is_efer_nx()) { > - entry->edx &= ~(1 << 20); > + if (entry && (entry->edx & bit(X86_FEATURE_NX)) && !is_efer_nx()) { > + entry->edx &= ~bit(X86_FEATURE_NX); > printk(KERN_INFO "kvm: guest NX capability removed\n"); > } > } > Applying, thanks. Paolo