diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /arch/x86/kernel/entry_32.S | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
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 dd65143941a8..28b597ef9ca1 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" |