From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 13 Oct 2008 19:58:55 +0000 (+0200)
Subject: m68k: Define rtc_lock on Atari
X-Git-Tag: v2.6.28-rc1~590
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7ae4833af0dda3bdfb65004856c3f83871fd8ce4;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c
index e2df4a13d2b..1edde27fa32 100644
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
@@ -20,6 +20,9 @@
 
 #include <asm/atariints.h>
 
+DEFINE_SPINLOCK(rtc_lock);
+EXPORT_SYMBOL_GPL(rtc_lock);
+
 void __init
 atari_sched_init(irq_handler_t timer_routine)
 {