diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-12 08:29:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-12 08:29:11 -0700 |
| commit | 45d53766b94b0b773e0090219c1aa3a313f4bb45 (patch) | |
| tree | e8965eff333f92564246b6392a22a62a4c034630 /kernel/trace/trace.h | |
| parent | 8d7a8fe2ce2f242953aef46226eaa8a4a1a2c380 (diff) | |
| parent | 58e8eedf18577c7eac722d5d1f190507ea263d1b (diff) | |
| download | olio-linux-3.10-45d53766b94b0b773e0090219c1aa3a313f4bb45.tar.xz olio-linux-3.10-45d53766b94b0b773e0090219c1aa3a313f4bb45.zip | |
Merge tag 'trace-fixes-v3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt:
"Yoshihiro Yunomae fixed a regression in the output format when using
one of the counter clocks.
The new multibuffer code changed the trace_clock file to update the
trace instances tr->clock_id but the actual traces still used the
value from the obsolete global variable trace_clock_id"
* tag 'trace-fixes-v3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Fix outputting formats of x86-tsc and counter when use trace_clock
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 711ca7d3e7f..20572ed88c5 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -700,8 +700,6 @@ enum print_line_t print_trace_line(struct trace_iterator *iter); extern unsigned long trace_flags; -extern int trace_clock_id; - /* Standard output formatting function used for function return traces */ #ifdef CONFIG_FUNCTION_GRAPH_TRACER |