diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 08:41:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 08:41:17 -0400 |
| commit | 86665c75da41889f92b774f31ea5a9a436f392a8 (patch) | |
| tree | 94b003ab677a64b7d0a6dcca1f636bbbc2a187c9 /kernel/trace/trace_output.c | |
| parent | 93776a8ec746cf9d32c36e5a5b23d28d8be28826 (diff) | |
| parent | 1bbe2a83ab68e5cf8c66c372c7cb3b51910c2cfe (diff) | |
Merge branch 'tracing/urgent' into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace_output.c')
| -rw-r--r-- | kernel/trace/trace_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index aeac358ee231..0e70fb07ca78 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c | |||
| @@ -433,7 +433,7 @@ int trace_print_lat_context(struct trace_iterator *iter) | |||
| 433 | 433 | ||
| 434 | trace_find_cmdline(entry->pid, comm); | 434 | trace_find_cmdline(entry->pid, comm); |
| 435 | 435 | ||
| 436 | ret = trace_seq_printf(s, "%16s %5d %3d %d %08x %08lx [%08lx]" | 436 | ret = trace_seq_printf(s, "%16s %5d %3d %d %08x %08lx [%08llx]" |
| 437 | " %ld.%03ldms (+%ld.%03ldms): ", comm, | 437 | " %ld.%03ldms (+%ld.%03ldms): ", comm, |
| 438 | entry->pid, iter->cpu, entry->flags, | 438 | entry->pid, iter->cpu, entry->flags, |
| 439 | entry->preempt_count, iter->idx, | 439 | entry->preempt_count, iter->idx, |