From 142d6729c5b221c37275dcfb8d23e912623c573e Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 21 Dec 2008 18:31:10 +0200
Subject: [PATCH] --- yaml --- r: 125306 b: refs/heads/master c:
 25e2343246fe135fce672f41abe61e9d2c38caac h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/mmu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 77b860957db9..e2a75df422d1 100644
--- 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
index 641c07844e6e..d50ebac6a07f 100644
--- 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) {