1 files changed, 3 insertions, 9 deletions

diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 19ee635eeb..626cdc8366 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -26,6 +26,7 @@
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/capability.h>
 #include <linux/console.h>
 #include <linux/module.h>
 #include <linux/serial.h>
@@ -107,7 +108,6 @@ static struct async_struct *IRQ_ports[NR_IRQS];
 static struct console *console;
 
 static unsigned char *tmp_buf;
-static DECLARE_MUTEX(tmp_buf_sem);
 
 extern struct console *console_drivers; /* from kernel/printk.c */
 
@@ -166,15 +166,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);
 }