From: Avi Kivity <avi@redhat.com>
Date: Sun, 3 May 2009 13:34:21 +0000 (+0300)
Subject: KVM: Fix NX support reporting
X-Git-Tag: kvm-86rc2~41
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f84c427c8afbe84eef91de75dba9db0148e38bac;p=users%2Fdwmw2%2Flinux.git

KVM: Fix NX support reporting

NX support is bit 20, not bit 1.

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 5fcde2c9e18ff..8b0d77707e16e 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1266,7 +1266,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
 		bit(X86_FEATURE_CMOV) | bit(X86_FEATURE_PSE36) |
 		bit(X86_FEATURE_MMX) | bit(X86_FEATURE_FXSR) |
 		bit(X86_FEATURE_SYSCALL) |
-		(bit(X86_FEATURE_NX) && is_efer_nx()) |
+		(is_efer_nx() ? bit(X86_FEATURE_NX) : 0) |
 #ifdef CONFIG_X86_64
 		bit(X86_FEATURE_LM) |
 #endif