From 0ba45fbd70ef811b8106fe1a3b805030d372d60e Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Sat, 12 Dec 2009 10:32:36 +0000
Subject: [PATCH] --- yaml --- r: 175860 b: refs/heads/master c:
 6698e34720660e18b45e2e3b115ee4584d0c3b5e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 856ae519328a..b87dd11f7494 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09cea96caa59fabab3030c53bd698b9b568d959a
+refs/heads/master: 6698e34720660e18b45e2e3b115ee4584d0c3b5e
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index 684f0e0b175e..f15df40bc318 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -516,7 +516,6 @@ static void do_tty_hangup(struct work_struct *work)
 	/* inuse_filps is protected by the single kernel lock */
 	lock_kernel();
 	check_tty_count(tty, "do_tty_hangup");
-	unlock_kernel();
 
 	file_list_lock();
 	/* This breaks for file handles being sent over AF_UNIX sockets ? */
@@ -531,7 +530,6 @@ static void do_tty_hangup(struct work_struct *work)
 	}
 	file_list_unlock();
 
-	lock_kernel();
 	tty_ldisc_hangup(tty);
 
 	read_lock(&tasklist_lock);