summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-23 20:38:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-23 20:38:50 -0800
commitadb9c9ac2e82ddbae4f635a9488ea4ee0a88feb6 (patch)
tree0c43684d343e6e59015b402ff7c73e2e6b9ef3dd /drivers
parenta80614d1adba903a1e5cb22bf14ebc640fc2ba4c (diff)
parentfb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff)
downloadblackbird-op-linux-adb9c9ac2e82ddbae4f635a9488ea4ee0a88feb6.tar.gz
blackbird-op-linux-adb9c9ac2e82ddbae4f635a9488ea4ee0a88feb6.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/hvc_console.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index 1994a92d4733..f65b2e14a485 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -335,6 +335,8 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
} /* else count == 0 */
tty->driver_data = hp;
+ tty->low_latency = 1; /* Makes flushes to ldisc synchronous. */
+
hp->tty = tty;
/* Save for request_irq outside of spin_lock. */
irq = hp->irq;
@@ -633,9 +635,6 @@ static int hvc_poll(struct hvc_struct *hp)
tty_insert_flip_char(tty, buf[i], 0);
}
- if (count)
- tty_schedule_flip(tty);
-
/*
* Account for the total amount read in one loop, and if above
* 64 bytes, we do a quick schedule loop to let the tty grok
@@ -656,6 +655,9 @@ static int hvc_poll(struct hvc_struct *hp)
bail:
spin_unlock_irqrestore(&hp->lock, flags);
+ if (read_total)
+ tty_flip_buffer_push(tty);
+
return poll_mask;
}
OpenPOWER on IntegriCloud