Merge branch 'pm-cpuidle'

[mirror_ubuntu-artful-kernel.git] / drivers / idle / intel_idle.c

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 9ddbf550bafa5c6e189ccfe6ca1b26cf599c5c00..a43220c2e3d943a3437e29df1352aca30593e4cf 100644 (file)
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -873,14 +873,19 @@ static int __init intel_idle_init(void)
        if (intel_idle_cpuidle_devices == NULL)
                return -ENOMEM;
 
+       cpu_notifier_register_begin();
+
        for_each_online_cpu(i) {
                retval = intel_idle_cpu_init(i);
                if (retval) {
+                       cpu_notifier_register_done();
                        cpuidle_unregister_driver(&intel_idle_driver);
                        return retval;
                }
        }
-       register_cpu_notifier(&cpu_hotplug_notifier);
+       __register_cpu_notifier(&cpu_hotplug_notifier);
+
+       cpu_notifier_register_done();
 
        return 0;
 }
@@ -890,10 +895,13 @@ static void __exit intel_idle_exit(void)
        intel_idle_cpuidle_devices_uninit();
        cpuidle_unregister_driver(&intel_idle_driver);
 
+       cpu_notifier_register_begin();
 
        if (lapic_timer_reliable_states != LAPIC_TIMER_ALWAYS_RELIABLE)
                on_each_cpu(__setup_broadcast_timer, (void *)false, 1);
-       unregister_cpu_notifier(&cpu_hotplug_notifier);
+       __unregister_cpu_notifier(&cpu_hotplug_notifier);
+
+       cpu_notifier_register_done();
 
        return;
 }