[Resend Patch] uml: fix a build error about tty

From: WANG Cong
Date: Thu Jul 24 2008 - 11:15:23 EST



This patch fixed this error:

CC arch/um/drivers/line.o
/home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c: In
function âline_write_interruptâ:
/home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c:366: error:
âstruct tty_ldiscâ has no member named âwrite_wakeupâ
/home/wangcong/Projects/linux-2.6/arch/um/drivers/line.c:367: error:
âstruct tty_ldiscâ has no member named âwrite_wakeupâ


Signed-off-by: WANG Cong <wangcong@xxxxxxxxx>
Cc: jdike@xxxxxxxxxxx
Acked-by: Alan Cox <alan@xxxxxxxxxx>

---
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index 5047490..d741f35 100644
--- a/arch/um/drivers/line.c
+++ b/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;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/