From f7a85382f5e2885cc2aa06ba758f8cc743eedac3 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Thu, 19 Apr 2012 10:31:47 -0400 Subject: [PATCH] --- yaml --- r: 299719 b: refs/heads/master c: db4c75cbebd7e5910cd3bcb6790272fcc3042857 h: refs/heads/master i: 299717: 013871074e3bea845607d1e09e7832dedebbe0e7 299715: 77d7cc83a7b04bdcea78360b0bf7387148b7b976 299711: 80f2b16bbd0a84168e04fb2be5647f8785c559ce v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_output.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f84f76a27f8f..9f0d79e1c713 100644 --- 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 index 859fae6b1825..df611a0e76c5 100644 --- 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);