diff options
author | Steven Rostedt <rostedt@goodmis.org> | 2008-10-06 19:06:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-20 12:27:03 -0400 |
commit | 606576ce816603d9fe1fb453a88bc6eea16ca709 (patch) | |
tree | 7c6844ff4d75f249df49e9e5fe97062d301c3a1f /kernel/trace/trace_selftest.c | |
parent | c2db8054c1eaf99983d8deee347876b01c26c2cf (diff) |
ftrace: rename FTRACE to FUNCTION_TRACER
Due to confusion between the ftrace infrastructure and the gcc profiling
tracer "ftrace", this patch renames the config options from FTRACE to
FUNCTION_TRACER. The other two names that are offspring from FTRACE
DYNAMIC_FTRACE and FTRACE_MCOUNT_RECORD will stay the same.
This patch was generated mostly by script, and partially by hand.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_selftest.c')
-rw-r--r-- | kernel/trace/trace_selftest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index 09cf230d7eca..95815d26a041 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c | |||
@@ -70,7 +70,7 @@ static int trace_test_buffer(struct trace_array *tr, unsigned long *count) | |||
70 | return ret; | 70 | return ret; |
71 | } | 71 | } |
72 | 72 | ||
73 | #ifdef CONFIG_FTRACE | 73 | #ifdef CONFIG_FUNCTION_TRACER |
74 | 74 | ||
75 | #ifdef CONFIG_DYNAMIC_FTRACE | 75 | #ifdef CONFIG_DYNAMIC_FTRACE |
76 | 76 | ||
@@ -226,7 +226,7 @@ trace_selftest_startup_function(struct tracer *trace, struct trace_array *tr) | |||
226 | 226 | ||
227 | return ret; | 227 | return ret; |
228 | } | 228 | } |
229 | #endif /* CONFIG_FTRACE */ | 229 | #endif /* CONFIG_FUNCTION_TRACER */ |
230 | 230 | ||
231 | #ifdef CONFIG_IRQSOFF_TRACER | 231 | #ifdef CONFIG_IRQSOFF_TRACER |
232 | int | 232 | int |