diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 13:08:53 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 13:08:53 -0500 |
| commit | b214b7bbffca8ac6a6f1dad46408f7a9d4219098 (patch) | |
| tree | 2ef03e062e2a04ea9f2d5439b0daea5274a1bc98 /drivers/tty/vt/selection.c | |
| parent | 7d48ec3698e7b747efa744fd340b0f2d1dbfd3e0 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
Merge commit 'v2.6.38-rc4' into spi/next
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) { |