1 files changed, 14 insertions, 3 deletions

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index c03ca5e9fe15..36b4591a7a2d 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -814,21 +814,32 @@ static void zs_exit(void)
 {
         int cpu;
 
+        cpu_notifier_register_begin();
+
         for_each_online_cpu(cpu)
                 zs_cpu_notifier(NULL, CPU_DEAD, (void *)(long)cpu);
-        unregister_cpu_notifier(&zs_cpu_nb);
+        __unregister_cpu_notifier(&zs_cpu_nb);
+
+        cpu_notifier_register_done();
 }
 
 static int zs_init(void)
 {
         int cpu, ret;
 
-        register_cpu_notifier(&zs_cpu_nb);
+        cpu_notifier_register_begin();
+
+        __register_cpu_notifier(&zs_cpu_nb);
         for_each_online_cpu(cpu) {
                 ret = zs_cpu_notifier(NULL, CPU_UP_PREPARE, (void *)(long)cpu);
-                if (notifier_to_errno(ret))
+                if (notifier_to_errno(ret)) {
+                        cpu_notifier_register_done();
                         goto fail;
+                }
         }
+
+        cpu_notifier_register_done();
+
         return 0;
 fail:
         zs_exit();