From f99cd6c97bd84ec088b1f7dd8a59b115f60c997f Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Mon, 11 Aug 2008 09:02:49 +0100
Subject: [PATCH] --- yaml --- r: 108111 b: refs/heads/master c:
 000b9151d7851cc1e490b2a76d0206e524f43cca h: refs/heads/master i:   108109:
 a6665e0812987430922470fcdc3c8610a2530a9f   108107:
 09ae56148fca5a3ba6b8090e888b757cd674931e   108103:
 e0e15750f4239316bb8a2588c3c2c5f85fa8de0a   108095:
 002862366561b15b37731d616ff8a9ba1bbb10ad v: v3

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

diff --git a/[refs] b/[refs]
index 325628f624a6..4f24c0a42459 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e7d5bb8480e10f98f89bd1d418a430393b1e995
+refs/heads/master: 000b9151d7851cc1e490b2a76d0206e524f43cca
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index e1b46bc7e43c..0e6866fe0f96 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -1161,8 +1161,8 @@ void disassociate_ctty(int on_exit)
 	tty = get_current_tty();
 	if (tty) {
 		tty_pgrp = get_pid(tty->pgrp);
-		mutex_unlock(&tty_mutex);
 		lock_kernel();
+		mutex_unlock(&tty_mutex);
 		/* XXX: here we race, there is nothing protecting tty */
 		if (on_exit && tty->driver->type != TTY_DRIVER_TYPE_PTY)
 			tty_vhangup(tty);