Re: tty patches in 2.6.13-mm3 (was Re: 2.6.13-mm1)

Joel Schopp
2005-09-12T16:57:06Z

> I'm not sure whether these are going in through some other channel,
> but I notice neither the Alan's hvcs.c or icom.c patches are in
> 2.6.13-mm3. In addition, hvc_console.c needs yet another...

Yeah, there is still a whole lot broken in -mm. Your patch below is a
good start though.

Acked-by: Joel Schopp <jschopp@austin.ibm.com>

> Signed-off-by: Serge Hallyn <serue@us.ibm.com>
>
> Index: linux-2.6.12/drivers/char/hvc_console.c
> ===================================================================
> --- linux-2.6.12.orig/drivers/char/hvc_console.c 2005-09-12 15:08:41.000000000 -0500
> +++ linux-2.6.12/drivers/char/hvc_console.c 2005-09-12 15:52:08.000000000 -0500
> @@ -597,7 +597,7 @@ static int hvc_poll(struct hvc_struct *h
>
> /* Read data if any */
> for (;;) {
> - count = tty_buffer_request_room(tty, N_INBUF);
> + int count = tty_buffer_request_room(tty, N_INBUF);
>
> /* If flip is full, just reschedule a later read */
> if (count == 0) {
> @@ -633,7 +633,7 @@ static int hvc_poll(struct hvc_struct *h
> tty_insert_flip_char(tty, buf[i], 0);
> }
>
> - if (tty->flip.count)
> + if (tty_buffer_request_room(tty, 1))
> tty_schedule_flip(tty);
>
> /*
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>