]> err.no Git - linux-2.6/commitdiff
KVM: MMU: No need to pick up nx bit from guest pte
authorAvi Kivity <avi@qumranet.com>
Sun, 9 Dec 2007 15:27:52 +0000 (17:27 +0200)
committerAvi Kivity <avi@qumranet.com>
Wed, 30 Jan 2008 15:53:20 +0000 (17:53 +0200)
We already set it according to cumulative access permissions.

Signed-off-by: Avi Kivity <avi@qumranet.com>
drivers/kvm/paging_tmpl.h

index 211fef83be5da898432d312c73ff34eff887ce0c..179ce9e8145e38fea4308dc07fa5113323b85641 100644 (file)
@@ -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))