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 /arch/powerpc/kernel/entry_64.S | |
| 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 'arch/powerpc/kernel/entry_64.S')
| -rw-r--r-- | arch/powerpc/kernel/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index fd8b4bae9b04..e6d52845854f 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
| @@ -884,7 +884,7 @@ _GLOBAL(enter_prom) | |||
| 884 | mtlr r0 | 884 | mtlr r0 |
| 885 | blr | 885 | blr |
| 886 | 886 | ||
| 887 | #ifdef CONFIG_FTRACE | 887 | #ifdef CONFIG_FUNCTION_TRACER |
| 888 | #ifdef CONFIG_DYNAMIC_FTRACE | 888 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 889 | _GLOBAL(mcount) | 889 | _GLOBAL(mcount) |
| 890 | _GLOBAL(_mcount) | 890 | _GLOBAL(_mcount) |