diff options
Diffstat (limited to 'arch/sh/kernel/time_32.c')
-rw-r--r-- | arch/sh/kernel/time_32.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/sh/kernel/time_32.c b/arch/sh/kernel/time_32.c index 0758b5ee8180..23ca711c27d2 100644 --- a/arch/sh/kernel/time_32.c +++ b/arch/sh/kernel/time_32.c | |||
@@ -1,9 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/time.c | 2 | * arch/sh/kernel/time_32.c |
3 | * | 3 | * |
4 | * Copyright (C) 1999 Tetsuya Okada & Niibe Yutaka | 4 | * Copyright (C) 1999 Tetsuya Okada & Niibe Yutaka |
5 | * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org> | 5 | * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org> |
6 | * Copyright (C) 2002 - 2007 Paul Mundt | 6 | * Copyright (C) 2002 - 2008 Paul Mundt |
7 | * Copyright (C) 2002 M. R. Brown <mrbrown@linux-sh.org> | 7 | * Copyright (C) 2002 M. R. Brown <mrbrown@linux-sh.org> |
8 | * | 8 | * |
9 | * Some code taken from i386 version. | 9 | * Some code taken from i386 version. |
@@ -16,6 +16,8 @@ | |||
16 | #include <linux/timex.h> | 16 | #include <linux/timex.h> |
17 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
18 | #include <linux/clockchips.h> | 18 | #include <linux/clockchips.h> |
19 | #include <linux/mc146818rtc.h> /* for rtc_lock */ | ||
20 | #include <linux/smp.h> | ||
19 | #include <asm/clock.h> | 21 | #include <asm/clock.h> |
20 | #include <asm/rtc.h> | 22 | #include <asm/rtc.h> |
21 | #include <asm/timer.h> | 23 | #include <asm/timer.h> |
@@ -253,6 +255,10 @@ void __init time_init(void) | |||
253 | set_normalized_timespec(&wall_to_monotonic, | 255 | set_normalized_timespec(&wall_to_monotonic, |
254 | -xtime.tv_sec, -xtime.tv_nsec); | 256 | -xtime.tv_sec, -xtime.tv_nsec); |
255 | 257 | ||
258 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | ||
259 | local_timer_setup(smp_processor_id()); | ||
260 | #endif | ||
261 | |||
256 | /* | 262 | /* |
257 | * Find the timer to use as the system timer, it will be | 263 | * Find the timer to use as the system timer, it will be |
258 | * initialized for us. | 264 | * initialized for us. |
@@ -260,6 +266,7 @@ void __init time_init(void) | |||
260 | sys_timer = get_sys_timer(); | 266 | sys_timer = get_sys_timer(); |
261 | printk(KERN_INFO "Using %s for system timer\n", sys_timer->name); | 267 | printk(KERN_INFO "Using %s for system timer\n", sys_timer->name); |
262 | 268 | ||
269 | |||
263 | if (sys_timer->ops->read) | 270 | if (sys_timer->ops->read) |
264 | clocksource_sh.read = sys_timer->ops->read; | 271 | clocksource_sh.read = sys_timer->ops->read; |
265 | 272 | ||