---

yaml --- r: 103723 b: refs/heads/master c: 131d827 h: refs/heads/master i: 103721: 3806d7a 103719: 2f3e130 v: v3
git-mirror · Jul 20, 2008 · 9edba6d · 9edba6d
1 parent 0e1e7d3
commit 9edba6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d761a501cf9cd4fa08ff35d252ff08b8c31ce677
+refs/heads/master: 131d82791b628d4aeafd94ddc74a9b68f3d15a83
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
@@ -850,7 +850,10 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,
 	hlist_add_head(&sp->hash_link, bucket);
 	if (!metaphysical)
 		rmap_write_protect(vcpu->kvm, gfn);
-	vcpu->arch.mmu.prefetch_page(vcpu, sp);
+	if (shadow_trap_nonpresent_pte != shadow_notrap_nonpresent_pte)
+		vcpu->arch.mmu.prefetch_page(vcpu, sp);
+	else
+		nonpaging_prefetch_page(vcpu, sp);
 	return sp;
 }