diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 688b4cf72d99..3a4032492fcb 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -1227,10 +1227,8 @@ print_lat_fmt(struct trace_iterator *iter, unsigned int trace_idx, int cpu) | |||
1227 | abs_usecs % 1000, rel_usecs/1000, | 1227 | abs_usecs % 1000, rel_usecs/1000, |
1228 | rel_usecs % 1000); | 1228 | rel_usecs % 1000); |
1229 | } else { | 1229 | } else { |
1230 | if (entry->type != TRACE_STACK) { | 1230 | lat_print_generic(s, entry, cpu); |
1231 | lat_print_generic(s, entry, cpu); | 1231 | lat_print_timestamp(s, abs_usecs, rel_usecs); |
1232 | lat_print_timestamp(s, abs_usecs, rel_usecs); | ||
1233 | } | ||
1234 | } | 1232 | } |
1235 | switch (entry->type) { | 1233 | switch (entry->type) { |
1236 | case TRACE_FN: | 1234 | case TRACE_FN: |
@@ -1293,17 +1291,15 @@ static int print_trace_fmt(struct trace_iterator *iter) | |||
1293 | usec_rem = do_div(t, 1000000ULL); | 1291 | usec_rem = do_div(t, 1000000ULL); |
1294 | secs = (unsigned long)t; | 1292 | secs = (unsigned long)t; |
1295 | 1293 | ||
1296 | if (entry->type != TRACE_STACK) { | 1294 | ret = trace_seq_printf(s, "%16s-%-5d ", comm, entry->pid); |
1297 | ret = trace_seq_printf(s, "%16s-%-5d ", comm, entry->pid); | 1295 | if (!ret) |
1298 | if (!ret) | 1296 | return 0; |
1299 | return 0; | 1297 | ret = trace_seq_printf(s, "[%02d] ", iter->cpu); |
1300 | ret = trace_seq_printf(s, "[%02d] ", iter->cpu); | 1298 | if (!ret) |
1301 | if (!ret) | 1299 | return 0; |
1302 | return 0; | 1300 | ret = trace_seq_printf(s, "%5lu.%06lu: ", secs, usec_rem); |
1303 | ret = trace_seq_printf(s, "%5lu.%06lu: ", secs, usec_rem); | 1301 | if (!ret) |
1304 | if (!ret) | 1302 | return 0; |
1305 | return 0; | ||
1306 | } | ||
1307 | 1303 | ||
1308 | switch (entry->type) { | 1304 | switch (entry->type) { |
1309 | case TRACE_FN: | 1305 | case TRACE_FN: |