diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 15:03:13 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 15:03:13 -0400 |
| commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
| tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /drivers/char/selection.c | |
| parent | 0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0 (diff) | |
| parent | 1f8a6b658a943b4f04a1fc7b3a420360202c86cd (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/selection.c')
| -rw-r--r-- | drivers/char/selection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/selection.c b/drivers/char/selection.c index 74cff839c857..a69f094d1ed3 100644 --- a/drivers/char/selection.c +++ b/drivers/char/selection.c | |||
| @@ -299,7 +299,7 @@ int paste_selection(struct tty_struct *tty) | |||
| 299 | pasted += count; | 299 | pasted += count; |
| 300 | } | 300 | } |
| 301 | remove_wait_queue(&vc->paste_wait, &wait); | 301 | remove_wait_queue(&vc->paste_wait, &wait); |
| 302 | current->state = TASK_RUNNING; | 302 | __set_current_state(TASK_RUNNING); |
| 303 | 303 | ||
| 304 | tty_ldisc_deref(ld); | 304 | tty_ldisc_deref(ld); |
| 305 | return 0; | 305 | return 0; |