From af08d39015e531541806d0930675f5268bc1777c Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Fri, 4 Jun 2010 21:52:17 +0800
Subject: [PATCH] --- yaml --- r: 202317 b: refs/heads/master c:
 03116aa57e75b1bbe8b5e04f3cd21cdb6588c4ba h: refs/heads/master i:   202315:
 a0ed3a4ad53cc9179d18b483d3317bbd48efa088 v: v3

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

diff --git a/[refs] b/[refs]
index 74b5034bc47b..bb58e5ed5b4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 518c8aee5ca74fc03273fc6b4893cf456d65d545
+refs/heads/master: 03116aa57e75b1bbe8b5e04f3cd21cdb6588c4ba
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index d3cd102aee26..3ac51153bc47 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -1629,7 +1629,7 @@ static int kvm_mmu_unprotect_page(struct kvm *kvm, gfn_t gfn)
 	bucket = &kvm->arch.mmu_page_hash[index];
 restart:
 	hlist_for_each_entry_safe(sp, node, n, bucket, hash_link)
-		if (sp->gfn == gfn && !sp->role.direct) {
+		if (sp->gfn == gfn && !sp->role.direct && !sp->role.invalid) {
 			pgprintk("%s: gfn %lx role %x\n", __func__, gfn,
 				 sp->role.word);
 			r = 1;