clocksource, dummy-timer: Fix CPU hotplug callback registration

[cascardo/linux.git] / drivers / clocksource / dummy_timer.c

diff --git a/drivers/clocksource/dummy_timer.c b/drivers/clocksource/dummy_timer.c
index b3eb582..ad35725 100644 (file)
--- a/drivers/clocksource/dummy_timer.c
+++ b/drivers/clocksource/dummy_timer.c
@@ -56,14 +56,19 @@ static struct notifier_block dummy_timer_cpu_nb = {
 
 static int __init dummy_timer_register(void)
 {
-       int err = register_cpu_notifier(&dummy_timer_cpu_nb);
+       int err = 0;
+
+       cpu_notifier_register_begin();
+       err = __register_cpu_notifier(&dummy_timer_cpu_nb);
        if (err)
-               return err;
+               goto out;
 
        /* We won't get a call on the boot CPU, so register immediately */
        if (num_possible_cpus() > 1)
                dummy_timer_setup();
 
-       return 0;
+out:
+       cpu_notifier_register_done();
+       return err;
 }
 early_initcall(dummy_timer_register);