From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 17:16:37 +0000 (+0200)
Subject: rtc: BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~33
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4333deee6b7a5a82afb9e700e76cb46e68fde68d;p=linux-2.6-omap-h63xx.git

rtc: BKL pushdown

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 5f80a9dff57..10f06a6bfeb 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -73,6 +73,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 #include <linux/sysctl.h>
 #include <linux/wait.h>
 #include <linux/bcd.h>
@@ -733,6 +734,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
  * needed here. Or anywhere else in this driver. */
 static int rtc_open(struct inode *inode, struct file *file)
 {
+	lock_kernel();
 	spin_lock_irq(&rtc_lock);
 
 	if (rtc_status & RTC_IS_OPEN)
@@ -742,10 +744,12 @@ static int rtc_open(struct inode *inode, struct file *file)
 
 	rtc_irq_data = 0;
 	spin_unlock_irq(&rtc_lock);
+	unlock_kernel();
 	return 0;
 
 out_busy:
 	spin_unlock_irq(&rtc_lock);
+	unlock_kernel();
 	return -EBUSY;
 }