diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
| commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
| tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /arch/x86/kernel/entry_32.S | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
| parent | 81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff) | |
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) | |||
| 1149 | 1149 | ||
| 1150 | #endif /* CONFIG_XEN */ | 1150 | #endif /* CONFIG_XEN */ |
| 1151 | 1151 | ||
| 1152 | #ifdef CONFIG_FTRACE | 1152 | #ifdef CONFIG_FUNCTION_TRACER |
| 1153 | #ifdef CONFIG_DYNAMIC_FTRACE | 1153 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 1154 | 1154 | ||
| 1155 | ENTRY(mcount) | 1155 | ENTRY(mcount) |
| @@ -1204,7 +1204,7 @@ trace: | |||
| 1204 | jmp ftrace_stub | 1204 | jmp ftrace_stub |
| 1205 | END(mcount) | 1205 | END(mcount) |
| 1206 | #endif /* CONFIG_DYNAMIC_FTRACE */ | 1206 | #endif /* CONFIG_DYNAMIC_FTRACE */ |
| 1207 | #endif /* CONFIG_FTRACE */ | 1207 | #endif /* CONFIG_FUNCTION_TRACER */ |
| 1208 | 1208 | ||
| 1209 | .section .rodata,"a" | 1209 | .section .rodata,"a" |
| 1210 | #include "syscall_table_32.S" | 1210 | #include "syscall_table_32.S" |