diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-17 05:37:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-17 05:37:37 -0400 |
| commit | 4176935b58eeb636917e65a2c388e4607e36cce6 (patch) | |
| tree | dac4e0005cda5a3a5a313dde35bbac2877d9bd93 /kernel/trace/trace.h | |
| parent | c269fc8c537d761f36cb98e637ae934d9331a9d5 (diff) | |
| parent | 6adaad14d7d4d3ef31b4e2dc992b18b5da7c4eb3 (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index f56162806f50..546bcbd92a0c 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -564,7 +564,7 @@ struct tracer_switch_ops { | |||
| 564 | }; | 564 | }; |
| 565 | #endif /* CONFIG_CONTEXT_SWITCH_TRACER */ | 565 | #endif /* CONFIG_CONTEXT_SWITCH_TRACER */ |
| 566 | 566 | ||
| 567 | extern char *trace_find_cmdline(int pid); | 567 | extern void trace_find_cmdline(int pid, char comm[]); |
| 568 | 568 | ||
| 569 | #ifdef CONFIG_DYNAMIC_FTRACE | 569 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 570 | extern unsigned long ftrace_update_tot_cnt; | 570 | extern unsigned long ftrace_update_tot_cnt; |