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/sparc64/lib/mcount.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/sparc64/lib/mcount.S')
-rw-r--r-- | arch/sparc64/lib/mcount.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc64/lib/mcount.S index fad90ddb3a28..7ce9c65f3592 100644 --- a/arch/sparc64/lib/mcount.S +++ b/arch/sparc64/lib/mcount.S | |||
@@ -93,7 +93,7 @@ mcount: | |||
93 | nop | 93 | nop |
94 | 1: | 94 | 1: |
95 | #endif | 95 | #endif |
96 | #ifdef CONFIG_FTRACE | 96 | #ifdef CONFIG_FUNCTION_TRACER |
97 | #ifdef CONFIG_DYNAMIC_FTRACE | 97 | #ifdef CONFIG_DYNAMIC_FTRACE |
98 | mov %o7, %o0 | 98 | mov %o7, %o0 |
99 | .globl mcount_call | 99 | .globl mcount_call |
@@ -119,7 +119,7 @@ mcount_call: | |||
119 | .size _mcount,.-_mcount | 119 | .size _mcount,.-_mcount |
120 | .size mcount,.-mcount | 120 | .size mcount,.-mcount |
121 | 121 | ||
122 | #ifdef CONFIG_FTRACE | 122 | #ifdef CONFIG_FUNCTION_TRACER |
123 | .globl ftrace_stub | 123 | .globl ftrace_stub |
124 | .type ftrace_stub,#function | 124 | .type ftrace_stub,#function |
125 | ftrace_stub: | 125 | ftrace_stub: |