diff --git a/[refs] b/[refs] index 208b0928e562..1eb31cad07e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41074d07c78b086b18fc2af590caef05dbcca568 +refs/heads/master: b4ab019ce71efe30790b5aaa396549a16bb20608 diff --git a/trunk/drivers/kvm/paging_tmpl.h b/trunk/drivers/kvm/paging_tmpl.h index 211fef83be5d..179ce9e8145e 100644 --- a/trunk/drivers/kvm/paging_tmpl.h +++ b/trunk/drivers/kvm/paging_tmpl.h @@ -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))