---

yaml --- r: 329917 b: refs/heads/master c: edc2ae8 h: refs/heads/master i: 329915: 18b2734 v: v3
git-mirror · Sep 20, 2012 · 989a233 · 989a233
1 parent 39396d3
commit 989a233
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;
 }