diff --git a/[refs] b/[refs]
index f0a1a19f7d7a..8dcc23b3be38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a35c27ac68cea19c252e127ec61099648eb4870
+refs/heads/master: 8bc5fb6abb670fa9079cd1994f016a39f99698fe
diff --git a/trunk/drivers/char/viocons.c b/trunk/drivers/char/viocons.c
index 65fb848e1cce..f48892ba12f5 100644
--- a/trunk/drivers/char/viocons.c
+++ b/trunk/drivers/char/viocons.c
@@ -705,10 +705,6 @@ static int viotty_ioctl(struct tty_struct *tty, struct file *file,
 	case KDSKBLED:
 		return 0;
 	}
-	/* FIXME: WTF is this being called for ??? */
-	lock_kernel();
-	ret =  n_tty_ioctl(tty, file, cmd, arg);
-	unlock_kernel();
 	return ret;
 }