---

yaml --- r: 299719 b: refs/heads/master c: db4c75c h: refs/heads/master i: 299717: 0138710 299715: 77d7cc8 299711: 80f2b16 v: v3
git-mirror · Apr 19, 2012 · f7a8538 · f7a8538
1 parent 02c69f5
commit f7a8538
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 348f0fc238efb441a28e7644c51f9fd3001b228a
+refs/heads/master: db4c75cbebd7e5910cd3bcb6790272fcc3042857
diff --git a/trunk/kernel/trace/trace_output.c b/trunk/kernel/trace/trace_output.c
@@ -652,6 +652,8 @@ int trace_print_lat_context(struct trace_iterator *iter)
 {
 	u64 next_ts;
 	int ret;
+	/* trace_find_next_entry will reset ent_size */
+	int ent_size = iter->ent_size;
 	struct trace_seq *s = &iter->seq;
 	struct trace_entry *entry = iter->ent,
 			   *next_entry = trace_find_next_entry(iter, NULL,
@@ -660,6 +662,9 @@ int trace_print_lat_context(struct trace_iterator *iter)
 	unsigned long abs_usecs = ns2usecs(iter->ts - iter->tr->time_start);
 	unsigned long rel_usecs;
 
+	/* Restore the original ent_size */
+	iter->ent_size = ent_size;
+
 	if (!next_entry)
 		next_ts = iter->ts;
 	rel_usecs = ns2usecs(next_ts - iter->ts);