summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2006-01-13 23:46:38 +0100
committerTony Luck <tony.luck@intel.com>2006-01-13 15:02:33 -0800
commitd50f5c5ca0c3426669fbe11ad4d5708d333eb9fb (patch)
tree6897918bb6aa95681cad854b93cbe8ecf8e5bee8
parentd3ef1f5aafcf7a4129eb2078c70bc9e577bc3af1 (diff)
downloadop-kernel-dev-d50f5c5ca0c3426669fbe11ad4d5708d333eb9fb.zip
op-kernel-dev-d50f5c5ca0c3426669fbe11ad4d5708d333eb9fb.tar.gz
[IA64] build broken for ia64 simserial.c
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>
-rw-r--r--arch/ia64/hp/sim/simserial.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index a346e18..27f23fa5 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -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);
}
OpenPOWER on IntegriCloud