From 21fc16b831c916a367be6897a244e1f8f33b5ac1 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Tue, 6 Apr 2010 18:31:13 +0800
Subject: [PATCH] --- yaml --- r: 197737 b: refs/heads/master c:
 24222c2fec75df30d56d1e2014d45d2559c94f1a h: refs/heads/master i:   197735:
 992036e18558e39a72f79b92d02cb6ae17b38519 v: v3

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

diff --git a/[refs] b/[refs]
index a255bc1e3ce0..88846c1b02f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f84cbb0561d7cefb5fc050ee99d8c82ec9ce883d
+refs/heads/master: 24222c2fec75df30d56d1e2014d45d2559c94f1a
diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h
index 067797a72768..d9dea288e51d 100644
--- a/trunk/arch/x86/kvm/paging_tmpl.h
+++ b/trunk/arch/x86/kvm/paging_tmpl.h
@@ -170,7 +170,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
 			goto access_error;
 
 #if PTTYPE == 64
-		if (fetch_fault && is_nx(vcpu) && (pte & PT64_NX_MASK))
+		if (fetch_fault && (pte & PT64_NX_MASK))
 			goto access_error;
 #endif