diff options
Diffstat (limited to 'drivers/char/selection.c')
-rw-r--r-- | drivers/char/selection.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/char/selection.c b/drivers/char/selection.c index f97b9e84806..ebae344ce91 100644 --- a/drivers/char/selection.c +++ b/drivers/char/selection.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/selection.h> | 26 | #include <linux/selection.h> |
27 | #include <linux/tiocl.h> | 27 | #include <linux/tiocl.h> |
28 | #include <linux/console.h> | 28 | #include <linux/console.h> |
29 | #include <linux/smp_lock.h> | ||
29 | 30 | ||
30 | /* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */ | 31 | /* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */ |
31 | #define isspace(c) ((c) == ' ') | 32 | #define isspace(c) ((c) == ' ') |
@@ -312,12 +313,20 @@ int paste_selection(struct tty_struct *tty) | |||
312 | struct tty_ldisc *ld; | 313 | struct tty_ldisc *ld; |
313 | DECLARE_WAITQUEUE(wait, current); | 314 | DECLARE_WAITQUEUE(wait, current); |
314 | 315 | ||
316 | /* always called with BTM from vt_ioctl */ | ||
317 | WARN_ON(!tty_locked()); | ||
318 | |||
315 | acquire_console_sem(); | 319 | acquire_console_sem(); |
316 | poke_blanked_console(); | 320 | poke_blanked_console(); |
317 | release_console_sem(); | 321 | release_console_sem(); |
318 | 322 | ||
319 | ld = tty_ldisc_ref_wait(tty); | 323 | ld = tty_ldisc_ref(tty); |
320 | 324 | if (!ld) { | |
325 | tty_unlock(); | ||
326 | ld = tty_ldisc_ref_wait(tty); | ||
327 | tty_lock(); | ||
328 | } | ||
329 | |||
321 | add_wait_queue(&vc->paste_wait, &wait); | 330 | add_wait_queue(&vc->paste_wait, &wait); |
322 | while (sel_buffer && sel_buffer_lth > pasted) { | 331 | while (sel_buffer && sel_buffer_lth > pasted) { |
323 | set_current_state(TASK_INTERRUPTIBLE); | 332 | set_current_state(TASK_INTERRUPTIBLE); |