diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-06-01 16:53:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 16:47:43 -0400 |
commit | ec79d6056de58511d8e46d9ae59d3878f958dc3e (patch) | |
tree | 8e73cf399c4cb3c31dbf3caced385cfc018a706a /drivers/char/selection.c | |
parent | 3f582b8c11014e4ce310d9839fb335164195333f (diff) |
tty: replace BKL with a new tty_lock
As a preparation for replacing the big kernel lock
in the TTY layer, wrap all the callers in new
macros tty_lock, tty_lock_nested and tty_unlock.
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/selection.c')
-rw-r--r-- | drivers/char/selection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/selection.c b/drivers/char/selection.c index 6e79340d732f..85211a3a5811 100644 --- a/drivers/char/selection.c +++ b/drivers/char/selection.c | |||
@@ -313,7 +313,7 @@ int paste_selection(struct tty_struct *tty) | |||
313 | struct tty_ldisc *ld; | 313 | struct tty_ldisc *ld; |
314 | DECLARE_WAITQUEUE(wait, current); | 314 | DECLARE_WAITQUEUE(wait, current); |
315 | 315 | ||
316 | lock_kernel(); | 316 | tty_lock_nested(); /* always called with BTM from vt_ioctl */ |
317 | 317 | ||
318 | acquire_console_sem(); | 318 | acquire_console_sem(); |
319 | poke_blanked_console(); | 319 | poke_blanked_console(); |
@@ -338,6 +338,6 @@ int paste_selection(struct tty_struct *tty) | |||
338 | __set_current_state(TASK_RUNNING); | 338 | __set_current_state(TASK_RUNNING); |
339 | 339 | ||
340 | tty_ldisc_deref(ld); | 340 | tty_ldisc_deref(ld); |
341 | unlock_kernel(); | 341 | tty_unlock(); |
342 | return 0; | 342 | return 0; |
343 | } | 343 | } |