Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 557055bebe9212dfa6b9f5df811dfd0dac77ec55

Authored by Zhaolei
Committed by Ingo Molnar
1 parent a3d03ecaf9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

tracing: Fix branch tracer header 

Before patch:

  # tracer: branch
  #
  #           TASK-PID    CPU#    TIMESTAMP  FUNCTION
  #              | |       |          |         |
             <...>-2981  [000] 24008.872738: [  ok  ] trace_irq_handler_exit:irq_event_types.h:41
             <...>-2981  [000] 24008.872742: [  ok  ] note_interrupt:spurious.c:229
  ...

After patch:

  # tracer: branch
  #
  #           TASK-PID    CPU#    TIMESTAMP  CORRECT  FUNC:FILE:LINE
  #              | |       |          |         |       |
             <...>-2985  [000] 26329.142970: [  ok  ] slab_free:slub.c:1776
             <...>-2985  [000] 26329.142972: [  ok  ] trace_kmem_cache_free:kmem_event_types.h:191
  ...

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <49E2F19A.3040006@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 8 additions and 0 deletions Side-by-side Diff

kernel/trace/trace_branch.c
Diff comments   View file @ 557055b
... ... @@ -155,6 +155,13 @@
155 155 return TRACE_TYPE_HANDLED;
156 156 }
157 157  
  158 +static void branch_print_header(struct seq_file *s)
  159 +{
  160 + seq_puts(s, "# TASK-PID CPU# TIMESTAMP CORRECT"
  161 + " FUNC:FILE:LINE\n");
  162 + seq_puts(s, "# | | | | | "
  163 + " |\n");
  164 +}
158 165  
159 166 static struct trace_event trace_branch_event = {
160 167 .type = TRACE_BRANCH,
... ... @@ -169,6 +176,7 @@
169 176 #ifdef CONFIG_FTRACE_SELFTEST
170 177 .selftest = trace_selftest_startup_branch,
171 178 #endif /* CONFIG_FTRACE_SELFTEST */
  179 + .print_header = branch_print_header,
172 180 };
173 181  
174 182 __init static int init_branch_tracer(void)