---

yaml --- r: 175860 b: refs/heads/master c: 6698e34 h: refs/heads/master v: v3
git-mirror · Dec 12, 2009 · 0ba45fb · 0ba45fb
1 parent c1d3cfd
commit 0ba45fb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);