diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:31:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:31:34 -0400 |
| commit | 9dbdd6c41c12fb42ee7188eafa7e1917b192af3a (patch) | |
| tree | 06a9eb894bc976c5c20e84ccd74fd82b9b71aed4 /arch/m32r/kernel/time.c | |
| parent | 7a693d3f0d10f978ebdf3082c41404ab97106567 (diff) | |
| parent | 161291396e76e0832c08f617eb9bd364d1648148 (diff) | |
Merge commit 'v2.6.32-rc4' into perf/core
Merge reason: we were on an -rc1 base, merge up to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m32r/kernel/time.c')
| -rw-r--r-- | arch/m32r/kernel/time.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index ba61c4c73202..e7fee0f198d5 100644 --- a/arch/m32r/kernel/time.c +++ b/arch/m32r/kernel/time.c | |||
| @@ -33,6 +33,15 @@ | |||
| 33 | 33 | ||
| 34 | #include <asm/hw_irq.h> | 34 | #include <asm/hw_irq.h> |
| 35 | 35 | ||
| 36 | #if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) | ||
| 37 | /* this needs a better home */ | ||
| 38 | DEFINE_SPINLOCK(rtc_lock); | ||
| 39 | |||
| 40 | #ifdef CONFIG_RTC_DRV_CMOS_MODULE | ||
| 41 | EXPORT_SYMBOL(rtc_lock); | ||
| 42 | #endif | ||
| 43 | #endif /* pc-style 'CMOS' RTC support */ | ||
| 44 | |||
| 36 | #ifdef CONFIG_SMP | 45 | #ifdef CONFIG_SMP |
| 37 | extern void smp_local_timer_interrupt(void); | 46 | extern void smp_local_timer_interrupt(void); |
| 38 | #endif | 47 | #endif |