From 8f0ed38f369e315b989beb07c47e5239c8dfee11 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Fri, 5 Jan 2007 16:36:47 -0800 Subject: [PATCH] --- yaml --- r: 45269 b: refs/heads/master c: cc4529efc7b730b596d9c7d5a917c00a357e92aa h: refs/heads/master i: 45267: 044f9795e3a969999513550cd7c50a7e76931ee2 v: v3 --- [refs] | 2 +- trunk/drivers/kvm/mmu.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e5c2d93399ca..24dee851cb8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 697fe2e24ac49f03a82f6cfe5d77f7a2122ff382 +refs/heads/master: cc4529efc7b730b596d9c7d5a917c00a357e92aa diff --git a/trunk/drivers/kvm/mmu.c b/trunk/drivers/kvm/mmu.c index 7e20dbf4f84c..d788866d5a6f 100644 --- a/trunk/drivers/kvm/mmu.c +++ b/trunk/drivers/kvm/mmu.c @@ -521,10 +521,6 @@ static void kvm_mmu_put_page(struct kvm_vcpu *vcpu, u64 *parent_pte) { mmu_page_remove_parent_pte(page, parent_pte); - kvm_mmu_page_unlink_children(vcpu, page); - hlist_del(&page->hash_link); - list_del(&page->link); - list_add(&page->link, &vcpu->free_pages); } static void kvm_mmu_zap_page(struct kvm_vcpu *vcpu, @@ -546,6 +542,10 @@ static void kvm_mmu_zap_page(struct kvm_vcpu *vcpu, kvm_mmu_put_page(vcpu, page, parent_pte); *parent_pte = 0; } + kvm_mmu_page_unlink_children(vcpu, page); + hlist_del(&page->hash_link); + list_del(&page->link); + list_add(&page->link, &vcpu->free_pages); } static int kvm_mmu_unprotect_page(struct kvm_vcpu *vcpu, gfn_t gfn)