Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2011-10-25 19:33:27 +0200
committerOlaf Hering <ohering@suse.de>2011-10-25 19:33:27 +0200
commit4dfa3acf42508dcc6177b582107f90843706d050 (patch)
tree24c19f4a19830ecc4dc527a245b78de1fb82b1de
parent993e1d6331b03a698ace473f0e056f0daeeeb5ed (diff)
tty deadlock in kernel-xen, xenconsole (bnc#726333).rpm-3.1.0-1.1--openSUSE-12.1-RC2rpm-3.1.0-1.1
-rw-r--r--drivers/xen/console/console.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/xen/console/console.c b/drivers/xen/console/console.c
index 4c2a6c7fb316..3926def0666e 100644
--- a/drivers/xen/console/console.c
+++ b/drivers/xen/console/console.c
@@ -623,16 +623,11 @@ static void xencons_close(struct tty_struct *tty, struct file *filp)
if (DUMMY_TTY(tty))
return;
- mutex_lock(&tty_mutex);
-
- if (tty->count != 1) {
- mutex_unlock(&tty_mutex);
+ if (tty->count != 1)
return;
- }
/* Prevent other threads from re-opening this tty. */
set_bit(TTY_CLOSING, &tty->flags);
- mutex_unlock(&tty_mutex);
tty->closing = 1;
tty_wait_until_sent(tty, 0);