diff options
author | Arnd Bergmann <arnd@arndb.de> | 2008-05-20 13:16:22 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-02 17:06:23 -0400 |
commit | e3e8e59dcd63621e3ade03083c17b6363a8e2dc8 (patch) | |
tree | 696f8d6eb20d7b6f00a5ec72d3c41bd4941913c7 | |
parent | f9c8154f367d471f1af56742fe8534f8458adb98 (diff) |
mvme16x-rtc: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/m68k/mvme16x/rtc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c index e341387787ab..432a9f13b2ed 100644 --- a/arch/m68k/mvme16x/rtc.c +++ b/arch/m68k/mvme16x/rtc.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
11 | #include <linux/miscdevice.h> | 11 | #include <linux/miscdevice.h> |
12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
13 | #include <linux/smp_lock.h> | ||
13 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
14 | #include <linux/capability.h> | 15 | #include <linux/capability.h> |
15 | #include <linux/fcntl.h> | 16 | #include <linux/fcntl.h> |
@@ -127,11 +128,14 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
127 | 128 | ||
128 | static int rtc_open(struct inode *inode, struct file *file) | 129 | static int rtc_open(struct inode *inode, struct file *file) |
129 | { | 130 | { |
131 | lock_kernel(); | ||
130 | if( !atomic_dec_and_test(&rtc_ready) ) | 132 | if( !atomic_dec_and_test(&rtc_ready) ) |
131 | { | 133 | { |
132 | atomic_inc( &rtc_ready ); | 134 | atomic_inc( &rtc_ready ); |
135 | unlock_kernel(); | ||
133 | return -EBUSY; | 136 | return -EBUSY; |
134 | } | 137 | } |
138 | unlock_kernel(); | ||
135 | 139 | ||
136 | return 0; | 140 | return 0; |
137 | } | 141 | } |