From cd035a5757777b9826eaa95f41941244969e0726 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:10 +0200
Subject: [PATCH] --- yaml --- r: 100357 b: refs/heads/master c:
 600bf8140c22e473ef0806ae45214aaaf53e0da3 h: refs/heads/master i:   100355:
 8412bfbad2dfaf007ab2342de106d906340bb246 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/char/lcd.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 217ca3a149ca..d280a1c091bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28fbbf491368c9491461ca492e13862da1b49180
+refs/heads/master: 600bf8140c22e473ef0806ae45214aaaf53e0da3
diff --git a/trunk/drivers/char/lcd.c b/trunk/drivers/char/lcd.c
index 4fe9206f84de..1c29b20e4f4c 100644
--- a/trunk/drivers/char/lcd.c
+++ b/trunk/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