diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
| commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
| tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /drivers/tty/vt/selection.c | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'drivers/tty/vt/selection.c')
| -rw-r--r-- | drivers/tty/vt/selection.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c index ebae344ce910..c956ed6c83a3 100644 --- a/drivers/tty/vt/selection.c +++ b/drivers/tty/vt/selection.c | |||
| @@ -316,9 +316,9 @@ int paste_selection(struct tty_struct *tty) | |||
| 316 | /* always called with BTM from vt_ioctl */ | 316 | /* always called with BTM from vt_ioctl */ |
| 317 | WARN_ON(!tty_locked()); | 317 | WARN_ON(!tty_locked()); |
| 318 | 318 | ||
| 319 | acquire_console_sem(); | 319 | console_lock(); |
| 320 | poke_blanked_console(); | 320 | poke_blanked_console(); |
| 321 | release_console_sem(); | 321 | console_unlock(); |
| 322 | 322 | ||
| 323 | ld = tty_ldisc_ref(tty); | 323 | ld = tty_ldisc_ref(tty); |
| 324 | if (!ld) { | 324 | if (!ld) { |