lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tracing/ftrace' into tracing/urgent

Browse Source
This commit is contained in:
Ingo Molnar
2008-10-22 09:08:14 +02:00
parent 2515ddc6db 81520a1b06
commit debfcaf93e
40 changed files with 113 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/entry_32.S
View File

@@ -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"