From 2e9ca86304cdb88ce1b458ded16c31c139c8cad4 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Fri, 21 Nov 2008 19:13:58 +0100
Subject: [PATCH] --- yaml --- r: 119639 b: refs/heads/master c:
 0c0f40bdbe4ddb48ebecfb5c2b56eeb175a57c45 h: refs/heads/master i:   119637:
 e82084a90c8245881f4e22f9a3c1db149e84e890   119635:
 ae2e3455ff5af71620b783628114d5d1e306b8e7   119631:
 e8a98b330d99a286938a6e3cf6db11cd803ecd34 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 6b50f7d20607..a93c50317c0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce50b91d0f7b0b90e3960a6f306b4027378c7c27
+refs/heads/master: 0c0f40bdbe4ddb48ebecfb5c2b56eeb175a57c45
diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c
index f1983d9477cd..410ddbc1aa2e 100644
--- a/trunk/arch/x86/kvm/mmu.c
+++ b/trunk/arch/x86/kvm/mmu.c
@@ -1038,13 +1038,13 @@ static int kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
 	}
 
 	rmap_write_protect(vcpu->kvm, sp->gfn);
+	kvm_unlink_unsync_page(vcpu->kvm, sp);
 	if (vcpu->arch.mmu.sync_page(vcpu, sp)) {
 		kvm_mmu_zap_page(vcpu->kvm, sp);
 		return 1;
 	}
 
 	kvm_mmu_flush_tlb(vcpu);
-	kvm_unlink_unsync_page(vcpu->kvm, sp);
 	return 0;
 }