Commit 514b677c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] n_tty.c cleanup

From: James Simmons <jsimmons@infradead.org>

Remove kd.h.  We don't need this header.  Use the inline functions to set
the current process state.
parent 8834e5d0
......@@ -40,7 +40,6 @@
#include <linux/tty.h>
#include <linux/timer.h>
#include <linux/ctype.h>
#include <linux/kd.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/slab.h>
......@@ -1091,7 +1090,7 @@ static ssize_t read_chan(struct tty_struct *tty, struct file *file,
set_bit(TTY_DONT_FLIP, &tty->flags);
continue;
}
current->state = TASK_RUNNING;
__set_current_state(TASK_RUNNING);
/* Deal with packet mode. */
if (tty->packet && b == buf) {
......@@ -1170,7 +1169,7 @@ static ssize_t read_chan(struct tty_struct *tty, struct file *file,
if (!waitqueue_active(&tty->read_wait))
tty->minimum_to_wake = minimum;
current->state = TASK_RUNNING;
__set_current_state(TASK_RUNNING);
size = b - buf;
if (size) {
retval = size;
......@@ -1246,7 +1245,7 @@ static ssize_t write_chan(struct tty_struct * tty, struct file * file,
schedule();
}
break_out:
current->state = TASK_RUNNING;
__set_current_state(TASK_RUNNING);
remove_wait_queue(&tty->write_wait, &wait);
return (b - buf) ? b - buf : retval;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment