tracing fixes
Linus,
Please pull the latest tracing-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus
Thanks,
Ingo
------------------>
Zhaolei (2):
tracing: Fix power tracer header
tracing: Fix branch tracer header
kernel/trace/trace_branch.c | 8 ++++++++ kernel/trace/trace_power.c | 7 +++++++ 2 files changed, 15 insertions(+), 0 deletions(-)
kernel/trace/trace_branch.c +8 -0
@@ -155,6 +155,13 @@ static enum print_line_t trace_branch_print(struct trace_iterator *iter,return TRACE_TYPE_HANDLED ; } +static void branch_print_header (struct seq_file *s) +{ +seq_puts (s,"# TASK-PID CPU# TIMESTAMP CORRECT" +" FUNC:FILE:LINE\n" ); +seq_puts (s,"# | | | | | " +" |\n" ); +}static struct trace_event trace_branch_event = { .type =TRACE_BRANCH ,
@@ -169,6 +176,7 @@ static struct tracer branch_trace __read_mostly =#ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_branch,#endif /* CONFIG_FTRACE_SELFTEST */ + .print_header = branch_print_header, };__init static int init_branch_tracer (void )
kernel/trace/trace_power.c +7 -0
@@ -186,6 +186,12 @@ static enum print_line_t power_print_line(struct trace_iterator *iter)return TRACE_TYPE_UNHANDLED ; } +static void power_print_header (struct seq_file *s) +{ +seq_puts (s,"# TIMESTAMP STATE EVENT\n" ); +seq_puts (s,"# | | |\n" ); +} +static struct tracer power_tracer__read_mostly = { .name ="power" ,
@@ -194,6 +200,7 @@ static struct tracer power_tracer __read_mostly = .stop = stop_power_trace, .reset = power_trace_reset, .print_line = power_print_line, + .print_header = power_print_header, };static int init_power_trace (void )