From 02b22c534be53e8bf022430b99d069361b7fc96e Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:15:55 +0200
Subject: [PATCH] --- yaml --- r: 100347 b: refs/heads/master c:
 742a2fe31bf311d065a2bbacc2b363103b351300 h: refs/heads/master i:   100345:
 04a92b951733ccfa1c68627a255c36c55a0b82dc   100343:
 8e27231b22f4d864a58fbe07ab70b1a7e721cb07 v: v3

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

diff --git a/[refs] b/[refs]
index f88e56a5a5a3..b2b00d150459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78abb6ac919cee123e632d833a42d0312ccb2b0d
+refs/heads/master: 742a2fe31bf311d065a2bbacc2b363103b351300
diff --git a/trunk/drivers/char/genrtc.c b/trunk/drivers/char/genrtc.c
index 69f0a2993af0..aac0985a572b 100644
--- a/trunk/drivers/char/genrtc.c
+++ b/trunk/drivers/char/genrtc.c
@@ -51,6 +51,7 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
+#include <linux/smp_lock.h>
 #include <linux/workqueue.h>
 
 #include <asm/uaccess.h>
@@ -338,12 +339,16 @@ static int gen_rtc_ioctl(struct inode *inode, struct file *file,
 
 static int gen_rtc_open(struct inode *inode, struct file *file)
 {
-	if (gen_rtc_status & RTC_IS_OPEN)
+	lock_kernel();
+	if (gen_rtc_status & RTC_IS_OPEN) {
+		unlock_kernel();
 		return -EBUSY;
+	}
 
 	gen_rtc_status |= RTC_IS_OPEN;
 	gen_rtc_irq_data = 0;
 	irq_active = 0;
+	unlock_kernel();
 
 	return 0;
 }