From 4179edca868c53f1b0ffc54e6b20ea91e5111912 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:22 +0200
Subject: [PATCH] --- yaml --- r: 100366 b: refs/heads/master c:
 e3e8e59dcd63621e3ade03083c17b6363a8e2dc8 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/m68k/mvme16x/rtc.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b4afbb4e567d..f2bff8cd80e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9c8154f367d471f1af56742fe8534f8458adb98
+refs/heads/master: e3e8e59dcd63621e3ade03083c17b6363a8e2dc8
diff --git a/trunk/arch/m68k/mvme16x/rtc.c b/trunk/arch/m68k/mvme16x/rtc.c
index e341387787ab..432a9f13b2ed 100644
--- a/trunk/arch/m68k/mvme16x/rtc.c
+++ b/trunk/arch/m68k/mvme16x/rtc.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h>
 #include <linux/miscdevice.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/ioport.h>
 #include <linux/capability.h>
 #include <linux/fcntl.h>
@@ -127,11 +128,14 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
 static int rtc_open(struct inode *inode, struct file *file)
 {
+	lock_kernel();
 	if( !atomic_dec_and_test(&rtc_ready) )
 	{
 		atomic_inc( &rtc_ready );
+		unlock_kernel();
 		return -EBUSY;
 	}
+	unlock_kernel();
 
 	return 0;
 }