diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:13 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 05:17:34 -0400 |
commit | 44347d947f628060b92449702071bfe1d31dfb75 (patch) | |
tree | c6ed74610d5b3295df4296659f80f5feb94b28cc /kernel/trace | |
parent | d94fc523f3c35bd8013f04827e94756cbc0212f4 (diff) | |
parent | 413f81eba35d6ede9289b0c8a920c013a84fac71 (diff) |
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')
-rw-r--r-- | kernel/trace/trace_branch.c | 8 | ||||
-rw-r--r-- | kernel/trace/trace_power.c | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index 8e64e604f5a7..7a7a9fd249a9 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c | |||
@@ -157,6 +157,13 @@ static enum print_line_t trace_branch_print(struct trace_iterator *iter, | |||
157 | return TRACE_TYPE_HANDLED; | 157 | return TRACE_TYPE_HANDLED; |
158 | } | 158 | } |
159 | 159 | ||
160 | static void branch_print_header(struct seq_file *s) | ||
161 | { | ||
162 | seq_puts(s, "# TASK-PID CPU# TIMESTAMP CORRECT" | ||
163 | " FUNC:FILE:LINE\n"); | ||
164 | seq_puts(s, "# | | | | | " | ||
165 | " |\n"); | ||
166 | } | ||
160 | 167 | ||
161 | static struct trace_event trace_branch_event = { | 168 | static struct trace_event trace_branch_event = { |
162 | .type = TRACE_BRANCH, | 169 | .type = TRACE_BRANCH, |
@@ -171,6 +178,7 @@ static struct tracer branch_trace __read_mostly = | |||
171 | #ifdef CONFIG_FTRACE_SELFTEST | 178 | #ifdef CONFIG_FTRACE_SELFTEST |
172 | .selftest = trace_selftest_startup_branch, | 179 | .selftest = trace_selftest_startup_branch, |
173 | #endif /* CONFIG_FTRACE_SELFTEST */ | 180 | #endif /* CONFIG_FTRACE_SELFTEST */ |
181 | .print_header = branch_print_header, | ||
174 | }; | 182 | }; |
175 | 183 | ||
176 | __init static int init_branch_tracer(void) | 184 | __init static int init_branch_tracer(void) |
diff --git a/kernel/trace/trace_power.c b/kernel/trace/trace_power.c index 810a5b7cf1c5..8a30d9874cd4 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) | |||
190 | return TRACE_TYPE_UNHANDLED; | 190 | return TRACE_TYPE_UNHANDLED; |
191 | } | 191 | } |
192 | 192 | ||
193 | static void power_print_header(struct seq_file *s) | ||
194 | { | ||
195 | seq_puts(s, "# TIMESTAMP STATE EVENT\n"); | ||
196 | seq_puts(s, "# | | |\n"); | ||
197 | } | ||
198 | |||
193 | static struct tracer power_tracer __read_mostly = | 199 | static struct tracer power_tracer __read_mostly = |
194 | { | 200 | { |
195 | .name = "power", | 201 | .name = "power", |
@@ -198,6 +204,7 @@ static struct tracer power_tracer __read_mostly = | |||
198 | .stop = stop_power_trace, | 204 | .stop = stop_power_trace, |
199 | .reset = power_trace_reset, | 205 | .reset = power_trace_reset, |
200 | .print_line = power_print_line, | 206 | .print_line = power_print_line, |
207 | .print_header = power_print_header, | ||
201 | }; | 208 | }; |
202 | 209 | ||
203 | static int init_power_trace(void) | 210 | static int init_power_trace(void) |