[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20080724151325.GP2993@hack.voiplan.pt>
Date: Thu, 24 Jul 2008 16:13:25 +0100
From: WANG Cong <xiyou.wangcong@...il.com>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Andrew Morton <akpm@...l.org>, jdike@...toit.com, alan@...hat.com
Subject: [Resend Patch] uml: fix a build error about tty
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@...ux.org>
Cc: jdike@...toit.com
Acked-by: Alan Cox <alan@...hat.com>
---
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists