summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2008-05-20 19:16:10 +0200
committerJonathan Corbet <corbet@lwn.net>2008-06-20 14:05:58 -0600
commit600bf8140c22e473ef0806ae45214aaaf53e0da3 (patch)
tree1dddfece76db611c38d59ba965b16f7ba6f44c0a
parent28fbbf491368c9491461ca492e13862da1b49180 (diff)
downloadblackbird-op-linux-600bf8140c22e473ef0806ae45214aaaf53e0da3.tar.gz
blackbird-op-linux-600bf8140c22e473ef0806ae45214aaaf53e0da3.zip
lcd: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--drivers/char/lcd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 4fe9206f84de..1c29b20e4f4c 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -20,6 +20,7 @@
#include <linux/mc146818rtc.h>
#include <linux/netdevice.h>
#include <linux/sched.h>
+#include <linux/smp_lock.h>
#include <linux/delay.h>
#include <asm/io.h>
@@ -414,6 +415,8 @@ static int lcd_ioctl(struct inode *inode, struct file *file,
static int lcd_open(struct inode *inode, struct file *file)
{
+ cycle_kernel_lock();
+
if (!lcd_present)
return -ENXIO;
else
OpenPOWER on IntegriCloud