From 0629754c4ca0200a449c09fdc3f700989cae1a76 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Thu, 13 May 2010 10:07:00 +0800
Subject: [PATCH] --- yaml --- r: 202281 b: refs/heads/master c:
 6d74229f013ed8e4a00d74cfa7a3fa6a2315c467 h: refs/heads/master i:   202279:
 cc2c7c6c2e7e6ad2cee16bc6c8938fcec8e2f9ef v: v3

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

diff --git a/[refs] b/[refs]
index 5453754a1e76..97049dbafd2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8ad9a707496c163312bcdd6aa3b90603d45dc9b
+refs/heads/master: 6d74229f013ed8e4a00d74cfa7a3fa6a2315c467
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index bb48b0ca5f8c..5c9d6df0113e 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -1813,6 +1813,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep,
 		if (level > PT_PAGE_TABLE_LEVEL &&
 		    has_wrprotected_page(vcpu->kvm, gfn, level)) {
 			ret = 1;
+			rmap_remove(vcpu->kvm, sptep);
 			spte = shadow_trap_nonpresent_pte;
 			goto set_pte;
 		}