]> err.no Git - linux-2.6/commitdiff
[IA64] build broken for ia64 simserial.c
authorAndreas Schwab <schwab@suse.de>
Fri, 13 Jan 2006 22:46:38 +0000 (23:46 +0100)
committerTony Luck <tony.luck@intel.com>
Fri, 13 Jan 2006 23:02:33 +0000 (15:02 -0800)
TTY layer buffering revamp broke ia64 in commit
 33f0f88f1c51ae5c2d593d26960c760ea154c2e2

  CC      arch/ia64/hp/sim/simserial.o
arch/ia64/hp/sim/simserial.c: In function `receive_chars':
arch/ia64/hp/sim/simserial.c:170: error: structure has no member named `flip'
 ... and so on ...
make[1]: *** [arch/ia64/hp/sim/simserial.o] Error 1

Patch from Andreas Schwab.

Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/hp/sim/simserial.c

index a346e1833bf2335b224a298469911233dab809fa..27f23fa5ca156e3a65622b43d05d1322fb871174 100644 (file)
@@ -167,15 +167,9 @@ static  void receive_chars(struct tty_struct *tty, struct pt_regs *regs)
                        }
                }
                seen_esc = 0;
-               if (tty->flip.count >= TTY_FLIPBUF_SIZE) break;
 
-               *tty->flip.char_buf_ptr = ch;
-
-               *tty->flip.flag_buf_ptr = 0;
-
-               tty->flip.flag_buf_ptr++;
-               tty->flip.char_buf_ptr++;
-               tty->flip.count++;
+               if (tty_insert_flip_char(tty, ch, TTY_NORMAL) == 0)
+                       break;
        }
        tty_flip_buffer_push(tty);
 }