From 267f838bca02ab8abecf0cf4af07653b3c83e3da Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Sun, 9 Dec 2007 17:27:52 +0200
Subject: [PATCH] --- yaml --- r: 80824 b: refs/heads/master c:
 b4ab019ce71efe30790b5aaa396549a16bb20608 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/kvm/paging_tmpl.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 208b0928e562..1eb31cad07e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41074d07c78b086b18fc2af590caef05dbcca568
+refs/heads/master: b4ab019ce71efe30790b5aaa396549a16bb20608
diff --git a/trunk/drivers/kvm/paging_tmpl.h b/trunk/drivers/kvm/paging_tmpl.h
index 211fef83be5d..179ce9e8145e 100644
--- a/trunk/drivers/kvm/paging_tmpl.h
+++ b/trunk/drivers/kvm/paging_tmpl.h
@@ -258,7 +258,6 @@ static void FNAME(set_pte)(struct kvm_vcpu *vcpu, pt_element_t gpte,
 	 * demand paging).
 	 */
 	spte = PT_PRESENT_MASK | PT_DIRTY_MASK;
-	spte |= gpte & PT64_NX_MASK;
 	if (!dirty)
 		pte_access &= ~ACC_WRITE_MASK;
 	if (!(pte_access & ACC_EXEC_MASK))