From 77db9bfd8425783bcc75c6be14e4e5696b9d32e4 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 4 Mar 2009 20:31:11 -0500
Subject: [PATCH] --- yaml --- r: 140857 b: refs/heads/master c:
 e74da5235cec6cb71eb338c987f876ecc793138b h: refs/heads/master i:   140855:
 c4afaf23a619ab4809723c0a6a6174b07b676877 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index edbceba93970..053e453949ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dc5d12b1f43134e9bc5037f69f4739cfdfab93e
+refs/heads/master: e74da5235cec6cb71eb338c987f876ecc793138b
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 57155dc53530..2e53e6f09440 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -361,7 +361,7 @@ ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf, size_t cnt)
 
 	cnt -= ret;
 
-	s->readpos += len;
+	s->readpos += cnt;
 	return cnt;
 }
 
@@ -380,7 +380,7 @@ ssize_t trace_seq_to_buffer(struct trace_seq *s, void *buf, size_t cnt)
 	if (!ret)
 		return -EFAULT;
 
-	s->readpos += len;
+	s->readpos += cnt;
 	return cnt;
 }