Merge branch 'tracing/urgent' into tracing/ftrace

This commit is contained in:
Ingo Molnar 2009-04-07 14:41:14 +02:00
commit 86665c75da
12 changed files with 42 additions and 15 deletions

View file

@ -433,7 +433,7 @@ int trace_print_lat_context(struct trace_iterator *iter)
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 [%08llx]"
" %ld.%03ldms (+%ld.%03ldms): ", comm,
entry->pid, iter->cpu, entry->flags,
entry->preempt_count, iter->idx,