diff options
author | Tony Lindgren <tony@atomide.com> | 2010-06-28 12:47:04 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-06-28 12:47:04 (GMT) |
commit | 41bd03ba0758a076671e5de35ed084535984143d (patch) | |
tree | 9a669f9f1f52996b38acb077655e4b044bba67c7 /arch/x86/kvm/mmu.c | |
parent | 090830b4c79cd5ac85430822a9b87c90848bedcf (diff) | |
parent | dc75925d67950889b79df1cc1518c21ec678df6c (diff) | |
download | linux-fsl-qoriq-41bd03ba0758a076671e5de35ed084535984143d.tar.xz |
Merge branch 'for_2.6.35rc' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r-- | arch/x86/kvm/mmu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 81563e7..a6f695d 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -1815,6 +1815,9 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, spte |= PT_WRITABLE_MASK; + if (!tdp_enabled && !(pte_access & ACC_WRITE_MASK)) + spte &= ~PT_USER_MASK; + /* * Optimization: for pte sync, if spte was writable the hash * lookup is unnecessary (and expensive). Write protection @@ -1870,6 +1873,8 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, child = page_header(pte & PT64_BASE_ADDR_MASK); mmu_page_remove_parent_pte(child, sptep); + __set_spte(sptep, shadow_trap_nonpresent_pte); + kvm_flush_remote_tlbs(vcpu->kvm); } else if (pfn != spte_to_pfn(*sptep)) { pgprintk("hfn old %lx new %lx\n", spte_to_pfn(*sptep), pfn); |