1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index 3c6768378a94..d6c74c1b5ea7 100644
--- a/drivers/powercap/intel_rapl.c
+++ b/drivers/powercap/intel_rapl.c
@@ -1369,6 +1369,9 @@ static int __init rapl_init(void)
 
                 return -ENODEV;
         }
+
+        cpu_notifier_register_begin();
+
         /* prevent CPU hotplug during detection */
         get_online_cpus();
         ret = rapl_detect_topology();
@@ -1380,20 +1383,23 @@ static int __init rapl_init(void)
                 ret = -ENODEV;
                 goto done;
         }
-        register_hotcpu_notifier(&rapl_cpu_notifier);
+        __register_hotcpu_notifier(&rapl_cpu_notifier);
 done:
         put_online_cpus();
+        cpu_notifier_register_done();
 
         return ret;
 }
 
 static void __exit rapl_exit(void)
 {
+        cpu_notifier_register_begin();
         get_online_cpus();
-        unregister_hotcpu_notifier(&rapl_cpu_notifier);
+        __unregister_hotcpu_notifier(&rapl_cpu_notifier);
         rapl_unregister_powercap();
         rapl_cleanup_data();
         put_online_cpus();
+        cpu_notifier_register_done();
 }
 
 module_init(rapl_init);