From 989a233d31c9934c1dfc75f1f8aab17afe73b680 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Wed, 12 Sep 2012 13:53:08 +0300
Subject: [PATCH] --- yaml --- r: 329917 b: refs/heads/master c:
 edc2ae84eb40a3c062210fe01af1cae1633cc810 h: refs/heads/master i:   329915:
 18b273416ae7d117bd320d49d00406e04df7f45c v: v3

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

diff --git a/[refs] b/[refs]
index 8b1d07cd28b1..a7ef9530500b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ea667f259e3767fd3ee85a885c14e417835695e
+refs/heads/master: edc2ae84eb40a3c062210fe01af1cae1633cc810
diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h
index bf7b4ffafab8..064bcb32d84e 100644
--- a/trunk/arch/x86/kvm/paging_tmpl.h
+++ b/trunk/arch/x86/kvm/paging_tmpl.h
@@ -106,10 +106,8 @@ static unsigned FNAME(gpte_access)(struct kvm_vcpu *vcpu, pt_element_t gpte)
 	unsigned access;
 
 	access = (gpte & (PT_WRITABLE_MASK | PT_USER_MASK)) | ACC_EXEC_MASK;
-
 #if PTTYPE == 64
-	if (vcpu->arch.mmu.nx)
-		access &= ~(gpte >> PT64_NX_SHIFT);
+	access &= ~(gpte >> PT64_NX_SHIFT);
 #endif
 	return access;
 }