diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 09:17:13 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 09:17:34 (GMT) |
| commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
| tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /kernel/trace/trace_power.c | |
| parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
| parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) | |
| download | linux-fsl-qoriq-44347d947f628060b92449702071bfe1d31dfb75.tar.xz | |
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
on a handful of tracing fixes present in .30-rc5-almost.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_power.c')
| -rw-r--r-- | kernel/trace/trace_power.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/trace/trace_power.c b/kernel/trace/trace_power.c index 810a5b7..8a30d98 100644 --- a/kernel/trace/trace_power.c +++ b/kernel/trace/trace_power.c @@ -190,6 +190,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", @@ -198,6 +204,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) |