From a31ee80052540d87ce2584960d5152d87fc15930 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 3 May 2009 16:34:21 +0300
Subject: [PATCH] --- yaml --- r: 144907 b: refs/heads/master c:
 334b8ad7b182fc14d720acd7729afda3ab4c7e3a h: refs/heads/master i:   144905:
 3afa3b28284c761261d072276ebcc917790959fc   144903:
 2ecdc679119cde70e41e74ff35ee918a8dba2812 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e4822a5f4b9..549ae307b54d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19bca6ab75d8118ae970fcc656359ddb467ac763
+refs/heads/master: 334b8ad7b182fc14d720acd7729afda3ab4c7e3a
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 7c1ce5ac6131..834a7bf25e48 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -1259,7 +1259,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