From 19321b938a76d198b6076eb0e22fff63890f7533 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Tue, 28 Jul 2009 20:17:22 +0800
Subject: [PATCH] --- yaml --- r: 156247 b: refs/heads/master c:
 74e7ff8c50b6b022e6ffaa736b16a4dc161d3eaf h: refs/heads/master i:   156245:
 ee1bc8ce1118d0fa927ee75f821cd0cf11e52c1d   156243:
 844a0ca8c7573bcff81bb1fa09f0c5f86fb06946   156239:
 e60debfde95e775cd5e5a0ed2a3350d19533934f v: v3

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

diff --git a/[refs] b/[refs]
index 9c1ada795b44..dce60e41a6d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38ceb592fcac9110c6b3c87ea0a27bff68c43486
+refs/heads/master: 74e7ff8c50b6b022e6ffaa736b16a4dc161d3eaf
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 8bc8d8afea6a..da984ad065ab 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -3085,7 +3085,8 @@ tracing_fill_pipe_page(size_t rem, struct trace_iterator *iter)
 			break;
 		}
 
-		trace_consume(iter);
+		if (ret != TRACE_TYPE_NO_CONSUME)
+			trace_consume(iter);
 		rem -= count;
 		if (!find_next_entry_inc(iter))	{
 			rem = 0;
@@ -4233,8 +4234,11 @@ static void __ftrace_dump(bool disable_tracing)
 		iter.pos = -1;
 
 		if (find_next_entry_inc(&iter) != NULL) {
-			print_trace_line(&iter);
-			trace_consume(&iter);
+			int ret;
+
+			ret = print_trace_line(&iter);
+			if (ret != TRACE_TYPE_NO_CONSUME)
+				trace_consume(&iter);
 		}
 
 		trace_printk_seq(&iter.seq);