summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-08-08 01:18:48 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-09-08 10:35:03 +0900
commit53c01d2dc38cd3cfaf5591ec5c6c9c4e437cfec2 (patch)
tree925b8f1c9e6b95445f721b0e3d36425b9d919fb5
parent71f0bdcab69ab36b1e939d36063aaf6c4a164ed3 (diff)
sh: Early dummy clockevent registration on boot CPU.
The dummy timer needs to be registered on the boot CPU before the system timer clockevent is registered, or broadcasting doesn't work as advertized. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/time_32.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c
index decee0a453a..e2f74cc71d8 100644
--- a/arch/sh/kernel/time_32.c
+++ b/arch/sh/kernel/time_32.c
@@ -254,6 +254,10 @@ void __init time_init(void)
set_normalized_timespec(&wall_to_monotonic,
-xtime.tv_sec, -xtime.tv_nsec);
+#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
+ local_timer_setup(smp_processor_id());
+#endif
+
/*
* Find the timer to use as the system timer, it will be
* initialized for us.
@@ -261,9 +265,6 @@ void __init time_init(void)
sys_timer = get_sys_timer();
printk(KERN_INFO "Using %s for system timer\n", sys_timer->name);
-#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
- local_timer_setup(smp_processor_id());
-#endif
if (sys_timer->ops->read)
clocksource_sh.read = sys_timer->ops->read;