From ceafd170c79c24d47a82caf38c08022021f855da Mon Sep 17 00:00:00 2001 From: Gui Jianfeng Date: Wed, 5 May 2010 09:03:49 +0800 Subject: [PATCH] --- yaml --- r: 202263 b: refs/heads/master c: 54a4f0239f2e98bc0842818f611a4cf73bb7dd35 h: refs/heads/master i: 202261: 970edebb5c24f2c6fa78aad3d1f5ba569fe7e6a0 202259: 3014884f92e8b48eeef52b621bac9b4de6e9b481 202255: d642747a9058a92f065a81eac4d3ecaa86c7d3f6 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/mmu.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 71e8c49a004c..846745a15492 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 518c5a05e89a79e498c95c3e29f29bd236b3c972 +refs/heads/master: 54a4f0239f2e98bc0842818f611a4cf73bb7dd35 diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c index b666d8d106a9..be981b1f1881 100644 --- a/trunk/arch/x86/kvm/mmu.c +++ b/trunk/arch/x86/kvm/mmu.c @@ -1504,6 +1504,8 @@ static int kvm_mmu_zap_page(struct kvm *kvm, struct kvm_mmu_page *sp) if (sp->unsync) kvm_unlink_unsync_page(kvm, sp); if (!sp->root_count) { + /* Count self */ + ret++; hlist_del(&sp->hash_link); kvm_mmu_free_page(kvm, sp); } else { @@ -1540,7 +1542,6 @@ void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages) page = container_of(kvm->arch.active_mmu_pages.prev, struct kvm_mmu_page, link); used_pages -= kvm_mmu_zap_page(kvm, page); - used_pages--; } kvm_nr_mmu_pages = used_pages; kvm->arch.n_free_mmu_pages = 0; @@ -2941,7 +2942,7 @@ static int kvm_mmu_remove_some_alloc_mmu_pages(struct kvm *kvm) page = container_of(kvm->arch.active_mmu_pages.prev, struct kvm_mmu_page, link); - return kvm_mmu_zap_page(kvm, page) + 1; + return kvm_mmu_zap_page(kvm, page); } static int mmu_shrink(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask)