diff options
| author | Peter Hurley <[email protected]> | 2015-07-13 00:50:50 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2015-07-24 01:23:56 +0000 |
| commit | af5554f957f8a7e28b9826a9c4ad2a7dedd15a78 (patch) | |
| tree | 0c6e36f1395a5d1507d040e6e454656522a692db /drivers/tty/tty_buffer.c | |
| parent | tty: Replace smp_rmb/smp_wmb with smp_load_acquire/smp_store_release (diff) | |
| download | kernel-af5554f957f8a7e28b9826a9c4ad2a7dedd15a78.tar.gz kernel-af5554f957f8a7e28b9826a9c4ad2a7dedd15a78.zip | |
tty: buffers: Move hidden buffer index advance into outer loop
The advance of the 'read' buffer index belongs in the outer
flip buffer consume loop, with the other buffer index arithmetic.
No functional change.
Signed-off-by: Peter Hurley <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/tty/tty_buffer.c')
| -rw-r--r-- | drivers/tty/tty_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c index 25ba5afbca13..5a3fa8913880 100644 --- a/drivers/tty/tty_buffer.c +++ b/drivers/tty/tty_buffer.c @@ -444,7 +444,6 @@ receive_buf(struct tty_struct *tty, struct tty_buffer *head, int count) if (count) disc->ops->receive_buf(tty, p, f, count); } - head->read += count; return count; } @@ -506,6 +505,7 @@ static void flush_to_ldisc(struct work_struct *work) count = receive_buf(tty, head, count); if (!count) break; + head->read += count; } mutex_unlock(&buf->lock); |