Merge branch 'kvm-guestmemfd' into HEAD

[thirdparty/linux.git] / arch / x86 / kvm / mmu / mmu.c

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 4de7670d59760ec94f3a2188036332bd07d97493..59b026b6ad2a291061916a70eb526ee930e61ae8 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -6883,11 +6883,7 @@ static unsigned long mmu_shrink_count(struct shrinker *shrink,
        return percpu_counter_read_positive(&kvm_total_used_mmu_pages);
 }
 
-static struct shrinker mmu_shrinker = {
-       .count_objects = mmu_shrink_count,
-       .scan_objects = mmu_shrink_scan,
-       .seeks = DEFAULT_SEEKS * 10,
-};
+static struct shrinker *mmu_shrinker;
 
 static void mmu_destroy_caches(void)
 {
@@ -7020,10 +7016,16 @@ int kvm_mmu_vendor_module_init(void)
        if (percpu_counter_init(&kvm_total_used_mmu_pages, 0, GFP_KERNEL))
                goto out;
 
-       ret = register_shrinker(&mmu_shrinker, "x86-mmu");
-       if (ret)
+       mmu_shrinker = shrinker_alloc(0, "x86-mmu");
+       if (!mmu_shrinker)
                goto out_shrinker;
 
+       mmu_shrinker->count_objects = mmu_shrink_count;
+       mmu_shrinker->scan_objects = mmu_shrink_scan;
+       mmu_shrinker->seeks = DEFAULT_SEEKS * 10;
+
+       shrinker_register(mmu_shrinker);
+
        return 0;
 
 out_shrinker:
@@ -7045,7 +7047,7 @@ void kvm_mmu_vendor_module_exit(void)
 {
        mmu_destroy_caches();
        percpu_counter_destroy(&kvm_total_used_mmu_pages);
-       unregister_shrinker(&mmu_shrinker);
+       shrinker_free(mmu_shrinker);
 }
 
 /*