diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-08-07 12:18:48 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-09-07 21:35:03 -0400 |
commit | 53c01d2dc38cd3cfaf5591ec5c6c9c4e437cfec2 (patch) | |
tree | 925b8f1c9e6b95445f721b0e3d36425b9d919fb5 /arch/sh/kernel/time_32.c | |
parent | 71f0bdcab69ab36b1e939d36063aaf6c4a164ed3 (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>
Diffstat (limited to 'arch/sh/kernel/time_32.c')
-rw-r--r-- | arch/sh/kernel/time_32.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c index decee0a453ab..e2f74cc71d8c 100644 --- a/arch/sh/kernel/time_32.c +++ b/arch/sh/kernel/time_32.c | |||
@@ -254,6 +254,10 @@ void __init time_init(void) | |||
254 | set_normalized_timespec(&wall_to_monotonic, | 254 | set_normalized_timespec(&wall_to_monotonic, |
255 | -xtime.tv_sec, -xtime.tv_nsec); | 255 | -xtime.tv_sec, -xtime.tv_nsec); |
256 | 256 | ||
257 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | ||
258 | local_timer_setup(smp_processor_id()); | ||
259 | #endif | ||
260 | |||
257 | /* | 261 | /* |
258 | * Find the timer to use as the system timer, it will be | 262 | * Find the timer to use as the system timer, it will be |
259 | * initialized for us. | 263 | * initialized for us. |
@@ -261,9 +265,6 @@ void __init time_init(void) | |||
261 | sys_timer = get_sys_timer(); | 265 | sys_timer = get_sys_timer(); |
262 | printk(KERN_INFO "Using %s for system timer\n", sys_timer->name); | 266 | printk(KERN_INFO "Using %s for system timer\n", sys_timer->name); |
263 | 267 | ||
264 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | ||
265 | local_timer_setup(smp_processor_id()); | ||
266 | #endif | ||
267 | 268 | ||
268 | if (sys_timer->ops->read) | 269 | if (sys_timer->ops->read) |
269 | clocksource_sh.read = sys_timer->ops->read; | 270 | clocksource_sh.read = sys_timer->ops->read; |