1 files changed, 8 insertions, 7 deletions

diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 7d9481c743f8..3225ae6c5180 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -198,14 +198,15 @@ static int __init cpuid_init(void)
                 goto out_chrdev;
         }
         cpuid_class->devnode = cpuid_devnode;
-        get_online_cpus();
+
+        cpu_notifier_register_begin();
         for_each_online_cpu(i) {
                 err = cpuid_device_create(i);
                 if (err != 0)
                         goto out_class;
         }
-        register_hotcpu_notifier(&cpuid_class_cpu_notifier);
-        put_online_cpus();
+        __register_hotcpu_notifier(&cpuid_class_cpu_notifier);
+        cpu_notifier_register_done();
 
         err = 0;
         goto out;
@@ -215,7 +216,7 @@ out_class:
         for_each_online_cpu(i) {
                 cpuid_device_destroy(i);
         }
-        put_online_cpus();
+        cpu_notifier_register_done();
         class_destroy(cpuid_class);
 out_chrdev:
         __unregister_chrdev(CPUID_MAJOR, 0, NR_CPUS, "cpu/cpuid");
@@ -227,13 +228,13 @@ static void __exit cpuid_exit(void)
 {
         int cpu = 0;
 
-        get_online_cpus();
+        cpu_notifier_register_begin();
         for_each_online_cpu(cpu)
                 cpuid_device_destroy(cpu);
         class_destroy(cpuid_class);
         __unregister_chrdev(CPUID_MAJOR, 0, NR_CPUS, "cpu/cpuid");
-        unregister_hotcpu_notifier(&cpuid_class_cpu_notifier);
-        put_online_cpus();
+        __unregister_hotcpu_notifier(&cpuid_class_cpu_notifier);
+        cpu_notifier_register_done();
 }
 
 module_init(cpuid_init);