[SCSI] Merge up to linux-2.6 head

[linux-2.6-omap-h63xx.git] / drivers / char / selection.c

diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index 71093a9fc462ac8f562a8c8e980a7d7deceadd89..a69f094d1ed3d8778d6c05506a346e1a56280f04 100644 (file)
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -33,7 +33,7 @@ extern void poke_blanked_console(void);
 
 /* Variables for selection control. */
 /* Use a dynamic buffer, instead of static (Dec 1994) */
-struct vc_data *sel_cons;              /* must not be disallocated */
+struct vc_data *sel_cons;              /* must not be deallocated */
 static volatile int sel_start = -1;    /* cleared by clear_selection */
 static int sel_end;
 static int sel_buffer_lth;
@@ -299,7 +299,7 @@ int paste_selection(struct tty_struct *tty)
                pasted += count;
        }
        remove_wait_queue(&vc->paste_wait, &wait);
-       current->state = TASK_RUNNING;
+       __set_current_state(TASK_RUNNING);
 
        tty_ldisc_deref(ld);
        return 0;