diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
commit | cbefa3258eade263dbc9ae2c1f1ea2ca96e6b457 (patch) | |
tree | 51f012ef93cc828be4eb693c0ced0503217d1025 /include/linux/kbd_kern.h | |
parent | 489ff4c7d167be954f715128790bd80d3c888322 (diff) | |
parent | 25bf368b3d98668c5d5f38e2201d8bca16e52680 (diff) |
Merge branch 'master'
Diffstat (limited to 'include/linux/kbd_kern.h')
-rw-r--r-- | include/linux/kbd_kern.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/kbd_kern.h b/include/linux/kbd_kern.h index 3aed37314ab8..e87c32a5c86a 100644 --- a/include/linux/kbd_kern.h +++ b/include/linux/kbd_kern.h | |||
@@ -153,8 +153,10 @@ static inline void con_schedule_flip(struct tty_struct *t) | |||
153 | { | 153 | { |
154 | unsigned long flags; | 154 | unsigned long flags; |
155 | spin_lock_irqsave(&t->buf.lock, flags); | 155 | spin_lock_irqsave(&t->buf.lock, flags); |
156 | if (t->buf.tail != NULL) | 156 | if (t->buf.tail != NULL) { |
157 | t->buf.tail->active = 0; | 157 | t->buf.tail->active = 0; |
158 | t->buf.tail->commit = t->buf.tail->used; | ||
159 | } | ||
158 | spin_unlock_irqrestore(&t->buf.lock, flags); | 160 | spin_unlock_irqrestore(&t->buf.lock, flags); |
159 | schedule_work(&t->buf.work); | 161 | schedule_work(&t->buf.work); |
160 | } | 162 | } |