diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2008-07-30 01:33:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-30 12:41:45 -0400 |
| commit | 06ac667903ebea8191d4f7e7fa4e0936161e25fe (patch) | |
| tree | 31f7db8236e260a92acbb77c79642e27d4ed42b1 /arch | |
| parent | 2c203003f64de5fe55ae35712942100d270667fa (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/drivers/line.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 5047490fc299..d741f35d7b3a 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) | |||
| 362 | if (tty == NULL) | 362 | if (tty == NULL) |
| 363 | return IRQ_NONE; | 363 | return IRQ_NONE; |
| 364 | 364 | ||
| 365 | if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && | 365 | tty_wakeup(tty); |
| 366 | (tty->ldisc.write_wakeup != NULL)) | ||
| 367 | (tty->ldisc.write_wakeup)(tty); | ||
| 368 | |||
| 369 | /* | ||
| 370 | * BLOCKING mode | ||
| 371 | * In blocking mode, everything sleeps on tty->write_wait. | ||
| 372 | * Sleeping in the console driver would break non-blocking | ||
| 373 | * writes. | ||
| 374 | */ | ||
| 375 | |||
| 376 | if (waitqueue_active(&tty->write_wait)) | ||
| 377 | wake_up_interruptible(&tty->write_wait); | ||
| 378 | return IRQ_HANDLED; | 366 | return IRQ_HANDLED; |
| 379 | } | 367 | } |
| 380 | 368 | ||
