From bbb2a50be6e3fb0849aca1d9e1b66d131c324734 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Tue, 27 Mar 2012 10:43:28 -0400
Subject: [PATCH] --- yaml --- r: 298341 b: refs/heads/master c:
 12b5da349a8b94c9dbc3430a6bc42eabd9eaf50b h: refs/heads/master i:   298339:
 a49da907cc9fb0ade0e71289a58c511ef7a88d10 v: v3

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

diff --git a/[refs] b/[refs]
index ddc50bffa8eb..8a0a3c240d51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c86bf172e550b4bf089ac7f0de3f6370e243842
+refs/heads/master: 12b5da349a8b94c9dbc3430a6bc42eabd9eaf50b
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 3a19c354edd6..ed7b5d1e12f4 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -1698,6 +1698,7 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu,
 	int cpu_file = iter->cpu_file;
 	u64 next_ts = 0, ts;
 	int next_cpu = -1;
+	int next_size = 0;
 	int cpu;
 
 	/*
@@ -1729,9 +1730,12 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu,
 			next_cpu = cpu;
 			next_ts = ts;
 			next_lost = lost_events;
+			next_size = iter->ent_size;
 		}
 	}
 
+	iter->ent_size = next_size;
+
 	if (ent_cpu)
 		*ent_cpu = next_cpu;