lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tracing: Fix branch tracer header
  tracing: Fix power tracer header
This commit is contained in:
Linus Torvalds
2009-04-16 18:17:22 -07:00
parent d06be22150 557055bebe
commit 9f76208c33
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/trace/trace_branch.c
View File

@@ -155,6 +155,13 @@ static enum print_line_t trace_branch_print(struct trace_iterator *iter,
return TRACE_TYPE_HANDLED; 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 = { static struct trace_event trace_branch_event = {
.type = TRACE_BRANCH, .type = TRACE_BRANCH,
@@ -169,6 +176,7 @@ static struct tracer branch_trace __read_mostly =
#ifdef CONFIG_FTRACE_SELFTEST #ifdef CONFIG_FTRACE_SELFTEST
.selftest = trace_selftest_startup_branch, .selftest = trace_selftest_startup_branch,
#endif /* CONFIG_FTRACE_SELFTEST */ #endif /* CONFIG_FTRACE_SELFTEST */
.print_header = branch_print_header,
}; };
__init static int init_branch_tracer(void) __init static int init_branch_tracer(void)

7
kernel/trace/trace_power.c
View File

@@ -186,6 +186,12 @@ static enum print_line_t power_print_line(struct trace_iterator *iter)
return TRACE_TYPE_UNHANDLED; 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 = static struct tracer power_tracer __read_mostly =
{ {
.name = "power", .name = "power",
@@ -194,6 +200,7 @@ static struct tracer power_tracer __read_mostly =
.stop = stop_power_trace, .stop = stop_power_trace,
.reset = power_trace_reset, .reset = power_trace_reset,
.print_line = power_print_line, .print_line = power_print_line,
.print_header = power_print_header,
}; };
static int init_power_trace(void) static int init_power_trace(void)