diff options
| -rw-r--r-- | drivers/char/misc.c | 1 | ||||
| -rw-r--r-- | drivers/char/tty_ioctl.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 2149e30bbca2..27bed88f2652 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -48,7 +48,6 @@ #include <linux/init.h> #include <linux/tty.h> -#include <linux/selection.h> #include <linux/kmod.h> #include "busmouse.h" diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index 00aa3598c951..e89b692a2ded 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c @@ -65,7 +65,7 @@ void tty_wait_until_sent(struct tty_struct * tty, long timeout) if (tty->driver.wait_until_sent) tty->driver.wait_until_sent(tty, timeout); stop_waiting: - current->state = TASK_RUNNING; + set_current_state(TASK_RUNNING); remove_wait_queue(&tty->write_wait, &wait); } |