summaryrefslogtreecommitdiffstats
path: root/include/linux/tty_flip.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-02-10 16:53:29 +0000
committerSteve French <sfrench@us.ibm.com>2006-02-10 16:53:29 +0000
commitb580513e841d81eebf0d7b02f412be0882c2ce5f (patch)
tree9336a14058eed66c335db10512f33a31f9e8c938 /include/linux/tty_flip.h
parent04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff)
parent418aade459f03318defd18ef0b11981a63bd81b0 (diff)
downloadlinux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.gz
linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.bz2
linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/linux/tty_flip.h')
-rw-r--r--include/linux/tty_flip.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h
index 82961eb19888..222faf97d5f9 100644
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
@@ -29,8 +29,10 @@ _INLINE_ void tty_schedule_flip(struct tty_struct *tty)
{
unsigned long flags;
spin_lock_irqsave(&tty->buf.lock, flags);
- if (tty->buf.tail != NULL)
+ if (tty->buf.tail != NULL) {
tty->buf.tail->active = 0;
+ tty->buf.tail->commit = tty->buf.tail->used;
+ }
spin_unlock_irqrestore(&tty->buf.lock, flags);
schedule_delayed_work(&tty->buf.work, 1);
}