kvm: reduce couple for ACC_EXEC_MASK

Commit Message

Lai Jiangshan April 17, 2010, 9:08 a.m. UTC

None

Patch

diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 81eab9a..34f4aa2 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -101,11 +101,9 @@  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 (is_nx(vcpu))
-		access &= ~(gpte >> PT64_NX_SHIFT);
-#endif
+	access = (gpte & (PT_WRITABLE_MASK | PT_USER_MASK));
+	if (PTTYPE != 64 || !is_nx(vcpu) || (gpte & PT64_NX_MASK))
+		access |= ACC_EXEC_MASK;
 	return access;
 }