From 34b69a2c5c4b54a23001d41782580140258650c5 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@redhat.com>
Date: Mon, 13 Oct 2008 10:36:40 +0100
Subject: [PATCH] --- yaml --- r: 113433 b: refs/heads/master c:
 e6885107736a4dd23e7d3bc103fe6d043c63c4de h: refs/heads/master i:   113431:
 2794b12c2410151eb8e0ef88361366c6d4014183 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/tty_io.c   | 4 ----
 trunk/drivers/char/vt.c       | 2 --
 trunk/drivers/char/vt_ioctl.c | 2 ++
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 894560aca655..ab77e580b8f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b70ac7718579b5cbf3bdd74fd01132d1c91596f4
+refs/heads/master: e6885107736a4dd23e7d3bc103fe6d043c63c4de
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index e4dce8709541..2f05728920e7 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -3026,10 +3026,6 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return put_user(tty->ldisc.ops->num, (int __user *)p);
 	case TIOCSETD:
 		return tiocsetd(tty, p);
-#ifdef CONFIG_VT
-	case TIOCLINUX:
-		return tioclinux(tty, arg);
-#endif
 	/*
 	 * Break handling
 	 */
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
index 60359c360912..05ca1c5dcb1c 100644
--- a/trunk/drivers/char/vt.c
+++ b/trunk/drivers/char/vt.c
@@ -2583,8 +2583,6 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
 	int lines;
 	int ret;
 
-	if (tty->driver->type != TTY_DRIVER_TYPE_CONSOLE)
-		return -EINVAL;
 	if (current->signal->tty != tty && !capable(CAP_SYS_ADMIN))
 		return -EPERM;
 	if (get_user(type, p))
diff --git a/trunk/drivers/char/vt_ioctl.c b/trunk/drivers/char/vt_ioctl.c
index c904e9ad4a71..8944ce508e2f 100644
--- a/trunk/drivers/char/vt_ioctl.c
+++ b/trunk/drivers/char/vt_ioctl.c
@@ -395,6 +395,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
  
 	kbd = kbd_table + console;
 	switch (cmd) {
+	case TIOCLINUX:
+		return tioclinux(tty, arg);
 	case KIOCSOUND:
 		if (!perm)
 			goto eperm;