---

yaml
---
r: 113455
b: refs/heads/master
c: bf7a06b
h: refs/heads/master
i:
  113453: 81aa09a
  113451: 212ba91
  113447: 90ef345
  113439: 078fed6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15582d36a15978355d2168eaa018a3736db7281f
+refs/heads/master: bf7a06bcce205705ea5c7675cbb8ea9239ea30a0

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;