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

serue
2005-09-12T16:34:39Z

Quoting Alan Cox (alan@redhat.com):
> On Thu, Sep 01, 2005 at 04:26:02PM -0500, Joel Schopp wrote:
> > It's like whack a mole. 30 more now in drivers/serial/jsm/jsm_tty.c and
> > drivers/serial/icom.c

Hi,

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...

> Keep whacking - obviously I don't have a PPC64 (*and please don't send
> me one*)

I do have one, but have been gone for awhile. But am willing and
eager to test (and get it working again :)

thanks,
-serge

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);

/*