From 4cdc3bf9eefb0c3f45d6bfc92345d5dc3e3ff2e2 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Tue, 26 May 2009 11:48:29 -0300
Subject: [PATCH 1/2] KVM: Fix NX support reporting

commit f84c427c8afbe84eef91de75dba9db0148e38bac
Author: Avi Kivity <avi@redhat.com>
Date:   Sun May 3 16:34:21 2009 +0300

KVM: Fix NX support reporting

NX support is bit 20, not bit 1.

Signed-off-by: Avi Kivity <avi@redhat.com>
Message-ID: <20090526144829.GB17390@amt.cnet>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Upstream-status: applied(kvm/master)
Acked-by: Glauber Costa <glommer@redhat.com>
Acked-by: Don Dutile <ddutile@redhat.com>
Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Dor Laor <dlaor@redhat.com>
Bugzilla: 503793
---
 arch/x86/kvm/x86.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 2e8f81d..29d80ed 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1228,7 +1228,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
-- 
1.6.3.rc4.29.g8146