Commit 06ac6679 authored Jul 29, 2008 by WANG Cong Committed by Linus Torvalds Jul 30, 2008

uml: fix tty-related build error



/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@zeuux.org>
Cc: Jeff Dike <jdike@addtoit.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2c203003

arch/um/drivers/line.c

+1 −13

Original line number	Original line	Diff line number	Diff line
	@@ -362,19 +362,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
	if (tty == NULL)		if (tty == NULL)
	return IRQ_NONE;		return IRQ_NONE;

	if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&		tty_wakeup(tty);
	(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);
	return IRQ_HANDLED;		return IRQ_HANDLED;
	}		}