Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | [RFC 2/9] tty: make atomic_write_lock release tty_lock | Date | Tue, 30 Mar 2010 22:56:13 +0200 |
| |
Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/char/tty_io.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 25b82eb..ef21e1d 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -915,7 +915,7 @@ int tty_write_lock(struct tty_struct *tty, int ndelay) if (!mutex_trylock(&tty->atomic_write_lock)) { if (ndelay) return -EAGAIN; - if (mutex_lock_interruptible(&tty->atomic_write_lock)) + if (mutex_lock_interruptible_tty(&tty->atomic_write_lock)) return -ERESTARTSYS; } return 0; @@ -1024,7 +1024,7 @@ out: void tty_write_message(struct tty_struct *tty, char *msg) { if (tty) { - mutex_lock(&tty->atomic_write_lock); + mutex_lock_tty_off(&tty->atomic_write_lock); tty_lock(); if (tty->ops->write && !test_bit(TTY_CLOSING, &tty->flags)) { tty_unlock(); -- 1.7.0
| |