summaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_buffer.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2015-07-13 02:50:50 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-24 03:23:56 +0200
commitaf5554f957f8a7e28b9826a9c4ad2a7dedd15a78 (patch)
tree0c6e36f1395a5d1507d040e6e454656522a692db /drivers/tty/tty_buffer.c
parenttty: Replace smp_rmb/smp_wmb with smp_load_acquire/smp_store_release (diff)
downloadlinux-af5554f957f8a7e28b9826a9c4ad2a7dedd15a78.tar.xz
linux-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 <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_buffer.c')
-rw-r--r--drivers/tty/tty_buffer.c2
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);