diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:18:02 -0400 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /arch/powerpc/kernel/entry_32.S | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/entry_32.S')
| -rw-r--r-- | arch/powerpc/kernel/entry_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 1cbbf7033641..7ecc0d1855c3 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S | |||
| @@ -1158,7 +1158,7 @@ machine_check_in_rtas: | |||
| 1158 | 1158 | ||
| 1159 | #endif /* CONFIG_PPC_RTAS */ | 1159 | #endif /* CONFIG_PPC_RTAS */ |
| 1160 | 1160 | ||
| 1161 | #ifdef CONFIG_FTRACE | 1161 | #ifdef CONFIG_FUNCTION_TRACER |
| 1162 | #ifdef CONFIG_DYNAMIC_FTRACE | 1162 | #ifdef CONFIG_DYNAMIC_FTRACE |
| 1163 | _GLOBAL(mcount) | 1163 | _GLOBAL(mcount) |
| 1164 | _GLOBAL(_mcount) | 1164 | _GLOBAL(_mcount) |