From ebd645c9a5c0b5b8f7efd4d2354022597bb20de4 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:39 +0200
Subject: [PATCH] --- yaml --- r: 100377 b: refs/heads/master c:
 41012735352e72b8a3f95521817dcad1b2986636 h: refs/heads/master i:   100375:
 a9cb87132c4503ce38fdf99b9c3fc5a157dd0315 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/rtc/rtc-m41t80.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 680ea64168bd..f6bbfebdb48e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4333deee6b7a5a82afb9e700e76cb46e68fde68d
+refs/heads/master: 41012735352e72b8a3f95521817dcad1b2986636
diff --git a/trunk/drivers/rtc/rtc-m41t80.c b/trunk/drivers/rtc/rtc-m41t80.c
index a3e0880b38fb..0a19c06019be 100644
--- a/trunk/drivers/rtc/rtc-m41t80.c
+++ b/trunk/drivers/rtc/rtc-m41t80.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <linux/i2c.h>
 #include <linux/rtc.h>
@@ -655,12 +656,16 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 static int wdt_open(struct inode *inode, struct file *file)
 {
 	if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
-		if (test_and_set_bit(0, &wdt_is_open))
+		lock_kernel();
+		if (test_and_set_bit(0, &wdt_is_open)) {
+			unlock_kernel();
 			return -EBUSY;
+		}
 		/*
 		 *	Activate
 		 */
 		wdt_is_open = 1;
+		unlock_kernel();
 		return 0;
 	}
 	return -ENODEV;