From 5a4ec3c0d710ca005c4c1cf0a4d86da5b7f473f3 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Thu, 2 Apr 2009 15:17:04 +0800
Subject: [PATCH] --- yaml --- r: 143110 b: refs/heads/master c:
 c7625a555f55d7ae49236cde551786c88f5a5ce1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 774a9f831073..0087576e77e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddd538f3e6a1a4bec2f6942f83a753263e6577b4
+refs/heads/master: c7625a555f55d7ae49236cde551786c88f5a5ce1
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 8e189ffb899a..94629760dabf 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -3428,13 +3428,6 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
 	int size, i;
 	size_t ret;
 
-	/*
-	 * We can't seek on a buffer input
-	 */
-	if (unlikely(*ppos))
-		return -ESPIPE;
-
-
 	for (i = 0; i < PIPE_BUFFERS && len; i++, len -= size) {
 		struct page *page;
 		int r;
@@ -3474,6 +3467,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
 		spd.partial[i].offset = 0;
 		spd.partial[i].private = (unsigned long)ref;
 		spd.nr_pages++;
+		*ppos += size;
 	}
 
 	spd.nr_pages = i;