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/x86/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/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 09e7145484c5..b86f332c96a6 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | 61 | ||
| 62 | .code64 | 62 | .code64 |
| 63 | 63 | ||
| 64 | #ifdef CONFIG_FTRACE | 64 | #ifdef CONFIG_FUNCTION_TRACER |
| 65 | #ifdef CONFIG_DYNAMIC_FTRACE | 65 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 66 | ENTRY(mcount) | 66 | ENTRY(mcount) |
| 67 | retq | 67 | retq |
| @@ -138,7 +138,7 @@ trace: | |||
| 138 | jmp ftrace_stub | 138 | jmp ftrace_stub |
| 139 | END(mcount) | 139 | END(mcount) |
| 140 | #endif /* CONFIG_DYNAMIC_FTRACE */ | 140 | #endif /* CONFIG_DYNAMIC_FTRACE */ |
| 141 | #endif /* CONFIG_FTRACE */ | 141 | #endif /* CONFIG_FUNCTION_TRACER */ |
| 142 | 142 | ||
| 143 | #ifndef CONFIG_PREEMPT | 143 | #ifndef CONFIG_PREEMPT |
| 144 | #define retint_kernel retint_restore_args | 144 | #define retint_kernel retint_restore_args |