From 48625215b2789f3e99c350a2fe6710e0031a5505 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@redhat.com>
Date: Mon, 13 Oct 2008 10:41:16 +0100
Subject: [PATCH] --- yaml --- r: 113455 b: refs/heads/master c:
 bf7a06bcce205705ea5c7675cbb8ea9239ea30a0 h: refs/heads/master i:   113453:
 81aa09a56ef58701652f1f03a70be38efc40cb44   113451:
 212ba91d728a317076a3a73d4811656aa239d1e6   113447:
 90ef34591669cacd2772e66e471df1186776efe9   113439:
 078fed625ae1e8a1faacd75e19f45c40dfaf37de v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/char/vt.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 56f60e57be6f..86baaeaf61a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15582d36a15978355d2168eaa018a3736db7281f
+refs/heads/master: bf7a06bcce205705ea5c7675cbb8ea9239ea30a0
diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c
index 05ca1c5dcb1c..ec94521c3118 100644
--- a/trunk/drivers/char/vt.c
+++ b/trunk/drivers/char/vt.c
@@ -2136,27 +2136,9 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
 	    release_console_sem();
 	    return 0;
 	}
-	release_console_sem();
-
 	orig_buf = buf;
 	orig_count = count;
 
-	/* At this point 'buf' is guaranteed to be a kernel buffer
-	 * and therefore no access to userspace (and therefore sleeping)
-	 * will be needed.  The con_buf_mtx serializes all tty based
-	 * console rendering and vcs write/read operations.  We hold
-	 * the console spinlock during the entire write.
-	 */
-
-	acquire_console_sem();
-
-	vc = tty->driver_data;
-	if (vc == NULL) {
-		printk(KERN_ERR "vt: argh, driver_data _became_ NULL !\n");
-		release_console_sem();
-		goto out;
-	}
-
 	himask = vc->vc_hi_font_mask;
 	charmask = himask ? 0x1ff : 0xff;