---

yaml --- r: 125306 b: refs/heads/master c: 25e2343 h: refs/heads/master v: v3
git-mirror · Dec 31, 2008 · 142d672 · 142d672
1 parent 608db99
commit 142d672
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe634fd46ff643d98fdbcd153847e08c3c076e6e
+refs/heads/master: 25e2343246fe135fce672f41abe61e9d2c38caac
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
@@ -1669,6 +1669,8 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte,
 	u64 mt_mask = shadow_mt_mask;
 	struct kvm_mmu_page *sp = page_header(__pa(shadow_pte));
 
+	if (!(vcpu->arch.cr4 & X86_CR4_PGE))
+		global = 0;
 	if (!global && sp->global) {
 		sp->global = 0;
 		if (sp->unsync) {