diff options
author | 2008-10-22 09:08:14 +0200 | |
---|---|---|
committer | 2008-10-22 09:08:14 +0200 | |
commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /arch/x86/kernel/entry_32.S | |
parent | binfmt_elf_fdpic: Update for cputime changes. (diff) | |
parent | ftrace: stack tracer only record when on stack (diff) | |
download | linux-debfcaf93ed500a051489db6646d71f29fe86a68.tar.gz linux-debfcaf93ed500a051489db6646d71f29fe86a68.tar.bz2 linux-debfcaf93ed500a051489db6646d71f29fe86a68.zip |
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
-rw-r--r-- | arch/x86/kernel/entry_32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index c356423a6026..008cc17521c3 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S @@ -1149,7 +1149,7 @@ ENDPROC(xen_failsafe_callback) #endif /* CONFIG_XEN */ -#ifdef CONFIG_FTRACE +#ifdef CONFIG_FUNCTION_TRACER #ifdef CONFIG_DYNAMIC_FTRACE ENTRY(mcount) @@ -1204,7 +1204,7 @@ trace: jmp ftrace_stub END(mcount) #endif /* CONFIG_DYNAMIC_FTRACE */ -#endif /* CONFIG_FTRACE */ +#endif /* CONFIG_FUNCTION_TRACER */ .section .rodata,"a" #include "syscall_table_32.S" |