diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-06-01 22:53:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 22:47:44 +0200 |
| commit | ddcd9fb66ae7f448b517242c10a31d4e17bcad45 (patch) | |
| tree | 54c5894f3c1dd45580cd45c621bbeb9174da879b /drivers/char/tty_ldisc.c | |
| parent | tty: untangle locking of wait_until_sent (diff) | |
| download | linux-ddcd9fb66ae7f448b517242c10a31d4e17bcad45.tar.xz linux-ddcd9fb66ae7f448b517242c10a31d4e17bcad45.zip | |
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/tty_ldisc.c')
| -rw-r--r-- | drivers/char/tty_ldisc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c index 0f494799da89..412f9775d19c 100644 --- a/drivers/char/tty_ldisc.c +++ b/drivers/char/tty_ldisc.c @@ -450,9 +450,8 @@ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld) if (ld->ops->open) { int ret; /* BTM here locks versus a hangup event */ - tty_lock_nested(); /* always held here already */ + WARN_ON(!tty_locked()); ret = ld->ops->open(tty); - tty_unlock(); return ret; } return 0; |