From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Tue, 6 Apr 2010 10:31:13 +0000 (+0800)
Subject: KVM: MMU: remove unnecessary NX check in walk_addr
X-Git-Tag: v2.6.35-rc1~436^2~110
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=24222c2fec75df30d56d1e2014d45d2559c94f1a;p=karo-tx-linux.git

KVM: MMU: remove unnecessary NX check in walk_addr

After is_rsvd_bits_set() checks, EFER.NXE must be enabled if NX bit is seted

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 067797a72768..d9dea288e51d 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -170,7 +170,7 @@ walk:
 			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