diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2008-05-20 19:16:37 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-02 15:06:24 -0600 |
| commit | 4333deee6b7a5a82afb9e700e76cb46e68fde68d (patch) | |
| tree | 0dee106feae97fe882044b6ea832336726d45c04 /drivers/char | |
| parent | f29b889edef0c3ab98732c84247c790a1583cb94 (diff) | |
| download | blackbird-op-linux-4333deee6b7a5a82afb9e700e76cb46e68fde68d.tar.gz blackbird-op-linux-4333deee6b7a5a82afb9e700e76cb46e68fde68d.zip | |
rtc: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/rtc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 5f80a9dff573..10f06a6bfeb5 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; } |
