epoll keyed wakeups - make tty use keyed wakeups
PATCH 7/7 epoll keyed wakeups - make tty use keyed wakeups
The following patch introduces keyed event wakeups inside the TTY code.
Signed-off-by Davide Libenzi <[email protected]>
- Davide
--- drivers/char/tty_io.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/char/tty_io.c +10 -10
@@ -464,7 +464,7 @@ void tty_wakeup(struct tty_struct *tty)tty_ldisc_deref (ld); } } -wake_up_interruptible (&tty->write_wait); +kwake_up_interruptible (&tty->write_wait,POLLOUT ); }EXPORT_SYMBOL_GPL (tty_wakeup);
@@ -587,8 +587,8 @@ static void do_tty_hangup(struct work_st* FIXME: Once we trust the LDISC code better we can wait here for * ldisc completion and fix the driver call race */ -wake_up_interruptible (&tty->write_wait); -wake_up_interruptible (&tty->read_wait); +kwake_up_interruptible (&tty->write_wait,POLLOUT ); +kwake_up_interruptible (&tty->read_wait,POLLIN );/* * Shutdown the current line discipline, and reset it to * N_TTY.
@@ -879,7 +879,7 @@ void stop_tty(struct tty_struct *tty)if (tty->link && tty->link->packet) { tty->ctrl_status &= ~TIOCPKT_START ; tty->ctrl_status |=TIOCPKT_STOP ; -wake_up_interruptible (&tty->link->read_wait); +kwake_up_interruptible (&tty->link->read_wait,POLLIN ); }spin_unlock_irqrestore (&tty->ctrl_lock, flags);if (tty->ops->stop)
@@ -913,7 +913,7 @@ void start_tty(struct tty_struct *tty)if (tty->link && tty->link->packet) { tty->ctrl_status &= ~TIOCPKT_STOP ; tty->ctrl_status |=TIOCPKT_START ; -wake_up_interruptible (&tty->link->read_wait); +kwake_up_interruptible (&tty->link->read_wait,POLLIN ); }spin_unlock_irqrestore (&tty->ctrl_lock, flags);if (tty->ops->start)
@@ -970,7 +970,7 @@ static ssize_t tty_read(struct file *filvoid tty_write_unlock (struct tty_struct *tty) {mutex_unlock (&tty->atomic_write_lock); -wake_up_interruptible (&tty->write_wait); +kwake_up_interruptible (&tty->write_wait,POLLOUT ); }int tty_write_lock (struct tty_struct *tty,int ndelay)
@@ -1623,21 +1623,21 @@ void tty_release_dev(struct file *filp)if (tty_closing) {if (waitqueue_active (&tty->read_wait)) { -wake_up (&tty->read_wait); +kwake_up (&tty->read_wait,POLLIN ); do_sleep++; }if (waitqueue_active (&tty->write_wait)) { -wake_up (&tty->write_wait); +kwake_up (&tty->write_wait,POLLOUT ); do_sleep++; } }if (o_tty_closing) {if (waitqueue_active (&o_tty->read_wait)) { -wake_up (&o_tty->read_wait); +kwake_up (&o_tty->read_wait,POLLIN ); do_sleep++; }if (waitqueue_active (&o_tty->write_wait)) { -wake_up (&o_tty->write_wait); +kwake_up (&o_tty->write_wait,POLLOUT ); do_sleep++; } }