git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing/urgent' into tracing/ftrace
[safe/jmp/linux-2.6]
/
kernel
/
trace
/
trace_output.c
diff --git
a/kernel/trace/trace_output.c
b/kernel/trace/trace_output.c
index
aeac358
..
0e70fb0
100644
(file)
--- 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)
trace_find_cmdline(entry->pid, comm);
trace_find_cmdline(entry->pid, comm);
- ret = trace_seq_printf(s, "%16s %5d %3d %d %08x %08lx [%08lx]"
+ ret = trace_seq_printf(s, "%16s %5d %3d %d %08x %08lx [%08l
l
x]"
" %ld.%03ldms (+%ld.%03ldms): ", comm,
entry->pid, iter->cpu, entry->flags,
entry->preempt_count, iter->idx,
" %ld.%03ldms (+%ld.%03ldms): ", comm,
entry->pid, iter->cpu, entry->flags,
entry->preempt_count, iter->idx,