diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-06-01 16:53:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 16:47:44 -0400 |
commit | ddcd9fb66ae7f448b517242c10a31d4e17bcad45 (patch) | |
tree | 54c5894f3c1dd45580cd45c621bbeb9174da879b /drivers/char/pty.c | |
parent | 203652192634c1fce5e79df0a8ff2fabfaefd3ab (diff) |
tty: remove tty_lock_nested
This changes all remaining users of tty_lock_nested
to be non-recursive, which lets us kill this function.
As a consequence, we won't need to keep the lock count
any more, which allows more simplifications later.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/pty.c')
-rw-r--r-- | drivers/char/pty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/pty.c b/drivers/char/pty.c index de22ea952832..f2d7a76fab54 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c | |||
@@ -62,7 +62,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp) | |||
62 | if (tty->driver == ptm_driver) | 62 | if (tty->driver == ptm_driver) |
63 | devpts_pty_kill(tty->link); | 63 | devpts_pty_kill(tty->link); |
64 | #endif | 64 | #endif |
65 | tty_vhangup(tty->link); | 65 | tty_vhangup_locked(tty->link); |
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||