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);