From 02233753b64334d0c6e956625e3b7455caad162e Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 8 Aug 2008 01:18:48 +0900 Subject: [PATCH] --- yaml --- r: 116083 b: refs/heads/master c: 53c01d2dc38cd3cfaf5591ec5c6c9c4e437cfec2 h: refs/heads/master i: 116081: 8a13bd61eaf28d7e14323065b09bd3c6439344a1 116079: 8b7dd03007956aedb66fd21444d0b889d10ff6dd v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/time_32.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bcd53b4ae8b3..d1427db92e35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71f0bdcab69ab36b1e939d36063aaf6c4a164ed3 +refs/heads/master: 53c01d2dc38cd3cfaf5591ec5c6c9c4e437cfec2 diff --git a/trunk/arch/sh/kernel/time_32.c b/trunk/arch/sh/kernel/time_32.c index decee0a453ab..e2f74cc71d8c 100644 --- a/trunk/arch/sh/kernel/time_32.c +++ b/trunk/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;