From 20e2a0b0a3fe21908822efe54336dbd72289bbe4 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Wed, 30 Apr 2008 00:53:25 -0700
Subject: [PATCH] --- yaml --- r: 95170 b: refs/heads/master c:
 dd9a451aad4fd7d5f46d2300c0e4fb70d8914453 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/char/viocons.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 826aeacd318c..2d173b04d64e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f8cabb7055b98300aa0798ee0f6513dfc130cc2
+refs/heads/master: dd9a451aad4fd7d5f46d2300c0e4fb70d8914453
diff --git a/trunk/drivers/char/viocons.c b/trunk/drivers/char/viocons.c
index 8de6b95aeb84..9319c63dda9a 100644
--- a/trunk/drivers/char/viocons.c
+++ b/trunk/drivers/char/viocons.c
@@ -704,8 +704,11 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
 	case KDSKBLED:
 		return 0;
 	}
-
-	return n_tty_ioctl(tty, file, cmd, arg);
+	/* FIXME: WTF is this being called for ??? */
+	lock_kernel();
+	ret =  n_tty_ioctl(tty, file, cmd, arg);
+	unlock_kernel();
+	return ret;
 }
 
 /*