提交 4333deee 编写于 作者: A Arnd Bergmann 提交者: Jonathan Corbet

rtc: BKL pushdown

Signed-off-by: NArnd Bergmann <arnd@arndb.de>
上级 f29b889e
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/smp_lock.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/bcd.h> #include <linux/bcd.h>
...@@ -733,6 +734,7 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -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. */ * needed here. Or anywhere else in this driver. */
static int rtc_open(struct inode *inode, struct file *file) static int rtc_open(struct inode *inode, struct file *file)
{ {
lock_kernel();
spin_lock_irq(&rtc_lock); spin_lock_irq(&rtc_lock);
if (rtc_status & RTC_IS_OPEN) if (rtc_status & RTC_IS_OPEN)
...@@ -742,10 +744,12 @@ static int rtc_open(struct inode *inode, struct file *file) ...@@ -742,10 +744,12 @@ static int rtc_open(struct inode *inode, struct file *file)
rtc_irq_data = 0; rtc_irq_data = 0;
spin_unlock_irq(&rtc_lock); spin_unlock_irq(&rtc_lock);
unlock_kernel();
return 0; return 0;
out_busy: out_busy:
spin_unlock_irq(&rtc_lock); spin_unlock_irq(&rtc_lock);
unlock_kernel();
return -EBUSY; return -EBUSY;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册