diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 00:57:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 00:57:06 -0400 |
| commit | 8a0382f6fceaf0c6479e582e1054f36333ea3d24 (patch) | |
| tree | 2ec107d486a57584f2b4ae431e70abbc11661d68 /arch/m32r/kernel/time.c | |
| parent | 0b5759c654e74c8dc317ea2c6b3a7476160f688a (diff) | |
| parent | 0a3d31b79e7fa600108e699805e2b2f9ea1f3194 (diff) | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: Fix IPI function calls for SMP
m32r: Fix set_memory() for DISCONTIGMEM
m32r: add rtc_lock variable
m32r: define ioread* and iowrite* macros
m32r: export delay loop symbols
m32r: fix tme_handler
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 |