diff options
Diffstat (limited to 'arch/powerpc/kernel/setup_32.c')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 5112a4aa801d..19e8fcb9cea8 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -81,7 +81,7 @@ int ucache_bsize; | |||
81 | * from the address that it was linked at, so we must use RELOC/PTRRELOC | 81 | * from the address that it was linked at, so we must use RELOC/PTRRELOC |
82 | * to access static data (including strings). -- paulus | 82 | * to access static data (including strings). -- paulus |
83 | */ | 83 | */ |
84 | unsigned long __init early_init(unsigned long dt_ptr) | 84 | notrace unsigned long __init early_init(unsigned long dt_ptr) |
85 | { | 85 | { |
86 | unsigned long offset = reloc_offset(); | 86 | unsigned long offset = reloc_offset(); |
87 | struct cpu_spec *spec; | 87 | struct cpu_spec *spec; |
@@ -111,7 +111,7 @@ unsigned long __init early_init(unsigned long dt_ptr) | |||
111 | * This is called very early on the boot process, after a minimal | 111 | * 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. | 112 | * MMU environment has been set up but before MMU_init is called. |
113 | */ | 113 | */ |
114 | void __init machine_init(unsigned long dt_ptr, unsigned long phys) | 114 | notrace void __init machine_init(unsigned long dt_ptr, unsigned long phys) |
115 | { | 115 | { |
116 | /* Enable early debugging if any specified (see udbg.h) */ | 116 | /* Enable early debugging if any specified (see udbg.h) */ |
117 | udbg_early_init(); | 117 | udbg_early_init(); |
@@ -133,7 +133,7 @@ void __init machine_init(unsigned long dt_ptr, unsigned long phys) | |||
133 | 133 | ||
134 | #ifdef CONFIG_BOOKE_WDT | 134 | #ifdef CONFIG_BOOKE_WDT |
135 | /* Checks wdt=x and wdt_period=xx command-line option */ | 135 | /* Checks wdt=x and wdt_period=xx command-line option */ |
136 | int __init early_parse_wdt(char *p) | 136 | notrace int __init early_parse_wdt(char *p) |
137 | { | 137 | { |
138 | if (p && strncmp(p, "0", 1) != 0) | 138 | if (p && strncmp(p, "0", 1) != 0) |
139 | booke_wdt_enabled = 1; | 139 | booke_wdt_enabled = 1; |