lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tty: remove tty_lock_nested

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2010-06-01 22:53:08 +02:00
committed by Greg Kroah-Hartman
parent 2036521926
commit ddcd9fb66a
5 changed files with 25 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/selection.c
View File

@@ -313,7 +313,8 @@ int paste_selection(struct tty_struct *tty)
struct tty_ldisc *ld;
DECLARE_WAITQUEUE(wait, current);
tty_lock_nested(); /* always called with BTM from vt_ioctl */
/* always called with BTM from vt_ioctl */
WARN_ON(!tty_locked());
acquire_console_sem();
poke_blanked_console();
@@ -343,6 +344,5 @@ int paste_selection(struct tty_struct *tty)
__set_current_state(TASK_RUNNING);
tty_ldisc_deref(ld);
tty_unlock();
return 0;
}