From ff698d1566f7a5f2bc5ee35638f7170a2ab7c974 Mon Sep 17 00:00:00 2001
From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Tue, 29 Jul 2008 22:33:34 -0700
Subject: [PATCH] --- yaml --- r: 107016 b: refs/heads/master c:
 06ac667903ebea8191d4f7e7fa4e0936161e25fe h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/arch/um/drivers/line.c | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index db3dd384bcd6..9bd0770d15f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c203003f64de5fe55ae35712942100d270667fa
+refs/heads/master: 06ac667903ebea8191d4f7e7fa4e0936161e25fe
diff --git a/trunk/arch/um/drivers/line.c b/trunk/arch/um/drivers/line.c
index 5047490fc299..d741f35d7b3a 100644
--- a/trunk/arch/um/drivers/line.c
+++ b/trunk/arch/um/drivers/line.c
@@ -362,19 +362,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
 	if (tty == NULL)
 		return IRQ_NONE;
 
-	if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
-	   (tty->ldisc.write_wakeup != NULL))
-		(tty->ldisc.write_wakeup)(tty);
-
-	/*
-	 * BLOCKING mode
-	 * In blocking mode, everything sleeps on tty->write_wait.
-	 * Sleeping in the console driver would break non-blocking
-	 * writes.
-	 */
-
-	if (waitqueue_active(&tty->write_wait))
-		wake_up_interruptible(&tty->write_wait);
+	tty_wakeup(tty);
 	return IRQ_HANDLED;
 }