aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/setup_32.c')
-rw-r--r--arch/powerpc/kernel/setup_32.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 5112a4aa801d..22f8e2bacd32 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -47,6 +47,11 @@
47#include <asm/kgdb.h> 47#include <asm/kgdb.h>
48#endif 48#endif
49 49
50#ifdef CONFIG_FTRACE
51extern void _mcount(void);
52EXPORT_SYMBOL(_mcount);
53#endif
54
50extern void bootx_init(unsigned long r4, unsigned long phys); 55extern void bootx_init(unsigned long r4, unsigned long phys);
51 56
52int boot_cpuid; 57int boot_cpuid;
@@ -81,7 +86,7 @@ int ucache_bsize;
81 * from the address that it was linked at, so we must use RELOC/PTRRELOC 86 * from the address that it was linked at, so we must use RELOC/PTRRELOC
82 * to access static data (including strings). -- paulus 87 * to access static data (including strings). -- paulus
83 */ 88 */
84unsigned long __init early_init(unsigned long dt_ptr) 89notrace unsigned long __init early_init(unsigned long dt_ptr)
85{ 90{
86 unsigned long offset = reloc_offset(); 91 unsigned long offset = reloc_offset();
87 struct cpu_spec *spec; 92 struct cpu_spec *spec;
@@ -111,7 +116,7 @@ unsigned long __init early_init(unsigned long dt_ptr)
111 * This is called very early on the boot process, after a minimal 116 * This is called very early on the boot process, after a minimal
112 * MMU environment has been set up but before MMU_init is called. 117 * MMU environment has been set up but before MMU_init is called.
113 */ 118 */
114void __init machine_init(unsigned long dt_ptr, unsigned long phys) 119notrace void __init machine_init(unsigned long dt_ptr, unsigned long phys)
115{ 120{
116 /* Enable early debugging if any specified (see udbg.h) */ 121 /* Enable early debugging if any specified (see udbg.h) */
117 udbg_early_init(); 122 udbg_early_init();
@@ -133,7 +138,7 @@ void __init machine_init(unsigned long dt_ptr, unsigned long phys)
133 138
134#ifdef CONFIG_BOOKE_WDT 139#ifdef CONFIG_BOOKE_WDT
135/* Checks wdt=x and wdt_period=xx command-line option */ 140/* Checks wdt=x and wdt_period=xx command-line option */
136int __init early_parse_wdt(char *p) 141notrace int __init early_parse_wdt(char *p)
137{ 142{
138 if (p && strncmp(p, "0", 1) != 0) 143 if (p && strncmp(p, "0", 1) != 0)
139 booke_wdt_enabled = 1; 144 booke_wdt_enabled = 1;