From 607a9cabd144acf4de156bc345a6f10c9a5bb67a Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 23 Aug 2010 16:13:15 +0800 Subject: [PATCH] --- yaml --- r: 215759 b: refs/heads/master c: 45bf21a8ce7a2884f067a702a5c7683684846ce1 h: refs/heads/master i: 215757: 9eb3fe564544ab7a590421a00faea9e2ea12ec25 215755: a2a38cd3f6cf644fd008217e2d25a2085eda0e4f 215751: 7ece299705aacf4316d154a41f8036a53d147792 215743: 9b782c45e38bf340a821f1154ead7d40aedfd454 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/mmu.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2786a1dec5f9..1cdd7c95b654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80b63faf028fba79e630d3643b0e615bddf4067b +refs/heads/master: 45bf21a8ce7a2884f067a702a5c7683684846ce1 diff --git a/trunk/arch/x86/kvm/mmu.c b/trunk/arch/x86/kvm/mmu.c index c2ac7004441a..54a50268cebf 100644 --- a/trunk/arch/x86/kvm/mmu.c +++ b/trunk/arch/x86/kvm/mmu.c @@ -3185,6 +3185,7 @@ static void mmu_destroy_caches(void) void kvm_mmu_module_exit(void) { mmu_destroy_caches(); + percpu_counter_destroy(&kvm_total_used_mmu_pages); unregister_shrinker(&mmu_shrinker); } @@ -3207,7 +3208,9 @@ int kvm_mmu_module_init(void) if (!mmu_page_header_cache) goto nomem; - percpu_counter_init(&kvm_total_used_mmu_pages, 0); + if (percpu_counter_init(&kvm_total_used_mmu_pages, 0)) + goto nomem; + register_shrinker(&mmu_shrinker); return 0;