From: Alan Cox Breakage reported by Adrian Bunk Untested (no hardware) Signed-off-by: Alan Cox Signed-off-by: Andrew Morton --- arch/v850/kernel/simcons.c | 25 ++++++++++--------------- arch/xtensa/platform-iss/console.c | 4 +--- drivers/serial/mcfserial.c | 3 +-- 3 files changed, 12 insertions(+), 20 deletions(-) diff -puN arch/v850/kernel/simcons.c~fix-some-uclinux-breakage-from-the-tty-updates arch/v850/kernel/simcons.c --- devel/arch/v850/kernel/simcons.c~fix-some-uclinux-breakage-from-the-tty-updates 2006-01-22 00:02:04.000000000 -0800 +++ devel-akpm/arch/v850/kernel/simcons.c 2006-01-22 00:02:04.000000000 -0800 @@ -117,6 +117,7 @@ late_initcall(simcons_tty_init); tty driver. */ void simcons_poll_tty (struct tty_struct *tty) { + char buf[32]; /* Not the nicest way to do it but I need it correct first */ int flip = 0, send_break = 0; struct pollfd pfd; pfd.fd = 0; @@ -124,21 +125,15 @@ void simcons_poll_tty (struct tty_struct if (V850_SIM_SYSCALL (poll, &pfd, 1, 0) > 0) { if (pfd.revents & POLLIN) { - int left = TTY_FLIPBUF_SIZE - tty->flip.count; - - if (left > 0) { - unsigned char *buf = tty->flip.char_buf_ptr; - int rd = V850_SIM_SYSCALL (read, 0, buf, left); - - if (rd > 0) { - tty->flip.count += rd; - tty->flip.char_buf_ptr += rd; - memset (tty->flip.flag_buf_ptr, 0, rd); - tty->flip.flag_buf_ptr += rd; - flip = 1; - } else - send_break = 1; - } + /* Real block hardware knows the transfer size before + transfer so the new tty buffering doesn't try to handle + this rather weird simulator specific case well */ + int rd = V850_SIM_SYSCALL (read, 0, buf, 32); + if (rd > 0) { + tty_insert_flip_string(tty, buf, rd); + flip = 1; + } else + send_break = 1; } else if (pfd.revents & POLLERR) send_break = 1; } diff -puN arch/xtensa/platform-iss/console.c~fix-some-uclinux-breakage-from-the-tty-updates arch/xtensa/platform-iss/console.c --- devel/arch/xtensa/platform-iss/console.c~fix-some-uclinux-breakage-from-the-tty-updates 2006-01-22 00:02:04.000000000 -0800 +++ devel-akpm/arch/xtensa/platform-iss/console.c 2006-01-22 00:02:04.000000000 -0800 @@ -124,9 +124,7 @@ static void rs_poll(unsigned long priv) while (__simc(SYS_select_one, 0, XTISS_SELECT_ONE_READ, (int)&tv,0,0)){ __simc (SYS_read, 0, (unsigned long)&c, 1, 0, 0); - tty->flip.count++; - *tty->flip.char_buf_ptr++ = c; - *tty->flip.flag_buf_ptr++ = TTY_NORMAL; + tty_insert_flip_char(tty, c, TTY_NORMAL); i++; } diff -puN drivers/serial/mcfserial.c~fix-some-uclinux-breakage-from-the-tty-updates drivers/serial/mcfserial.c --- devel/drivers/serial/mcfserial.c~fix-some-uclinux-breakage-from-the-tty-updates 2006-01-22 00:02:04.000000000 -0800 +++ devel-akpm/drivers/serial/mcfserial.c 2006-01-22 00:02:04.000000000 -0800 @@ -350,8 +350,7 @@ static inline void receive_chars(struct } tty_insert_flip_char(tty, ch, flag); } - - schedule_work(&tty->flip.work); + tty_flip_buffer_push(tty); return; } _