From 32be373bead6d413b4ce22266f99632ce9c05006 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Mon, 22 Jan 2007 20:40:40 -0800
Subject: [PATCH] --- yaml --- r: 45717 b: refs/heads/master c:
 fc3dffe12148b9612870eb21b24f2aecefa9ea24 h: refs/heads/master i:   45715:
 b5d637dd7f42e6a6eaa4ca9018d2fea1a85d0c22 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/kvm/paging_tmpl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2564886b9dc4..feb1fb20020f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 038e51de2e7ae2c8e9d8a0b15231f8509875dc33
+refs/heads/master: fc3dffe12148b9612870eb21b24f2aecefa9ea24
diff --git a/trunk/drivers/kvm/paging_tmpl.h b/trunk/drivers/kvm/paging_tmpl.h
index 2dbf4307ed9e..6bc41950fbb3 100644
--- a/trunk/drivers/kvm/paging_tmpl.h
+++ b/trunk/drivers/kvm/paging_tmpl.h
@@ -274,7 +274,7 @@ static int FNAME(fix_write_pf)(struct kvm_vcpu *vcpu,
 	struct kvm_mmu_page *page;
 
 	if (is_writeble_pte(*shadow_ent))
-		return 0;
+		return !user || (*shadow_ent & PT_USER_MASK);
 
 	writable_shadow = *shadow_ent & PT_SHADOW_WRITABLE_MASK;
 	if (user) {