aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2008-10-13 15:58:55 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-14 13:23:27 -0400
commit7ae4833af0dda3bdfb65004856c3f83871fd8ce4 (patch)
tree0a293445a8cc2b17bd815e02ebd75242b3c62b3d /arch
parent3e24fc947ce38e204c3bc58a7a68251facebf0ac (diff)
m68k: Define rtc_lock on Atari
The nvram and rtc-cmos drivers use the spinlock rtc_lock to protect against concurrent accesses to the CMOS memory. As m68k doesn't support SMP or preempt yet, the spinlock calls tend to get optimized away, but not for all configurations, causing in some rare cases: | ERROR: "rtc_lock" [drivers/rtc/rtc-cmos.ko] undefined! | ERROR: "rtc_lock" [drivers/char/nvram.ko] undefined! Add the spinlock to the Atari core code to avoid this. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Michael Schmitz <schmitz@debian.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/atari/time.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c
index e2df4a13d2bb..1edde27fa32d 100644
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
@@ -20,6 +20,9 @@
20 20
21#include <asm/atariints.h> 21#include <asm/atariints.h>
22 22
23DEFINE_SPINLOCK(rtc_lock);
24EXPORT_SYMBOL_GPL(rtc_lock);
25
23void __init 26void __init
24atari_sched_init(irq_handler_t timer_routine) 27atari_sched_init(irq_handler_t timer_routine)
25{ 28{