aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/clocksource/dummy_timer.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/clocksource/dummy_timer.c b/drivers/clocksource/dummy_timer.c
index b3eb582d6a6f..ad3572541728 100644
--- a/drivers/clocksource/dummy_timer.c
+++ b/drivers/clocksource/dummy_timer.c
@@ -56,14 +56,19 @@ static struct notifier_block dummy_timer_cpu_nb = {
56 56
57static int __init dummy_timer_register(void) 57static int __init dummy_timer_register(void)
58{ 58{
59 int err = register_cpu_notifier(&dummy_timer_cpu_nb); 59 int err = 0;
60
61 cpu_notifier_register_begin();
62 err = __register_cpu_notifier(&dummy_timer_cpu_nb);
60 if (err) 63 if (err)
61 return err; 64 goto out;
62 65
63 /* We won't get a call on the boot CPU, so register immediately */ 66 /* We won't get a call on the boot CPU, so register immediately */
64 if (num_possible_cpus() > 1) 67 if (num_possible_cpus() > 1)
65 dummy_timer_setup(); 68 dummy_timer_setup();
66 69
67 return 0; 70out:
71 cpu_notifier_register_done();
72 return err;
68} 73}
69early_initcall(dummy_timer_register); 74early_initcall(dummy_timer_register);