---

yaml --- r: 156247 b: refs/heads/master c: 74e7ff8 h: refs/heads/master i: 156245: ee1bc8c 156243: 844a0ca 156239: e60debf v: v3
git-mirror · Jul 28, 2009 · 19321b9 · 19321b9
1 parent 035264a
commit 19321b9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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);