diff options
Diffstat (limited to 'arch/powerpc/kernel/setup_32.c')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 69ac25701344..88832b3ee661 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -235,8 +235,6 @@ arch_initcall(ppc_init); | |||
235 | /* Warning, IO base is not yet inited */ | 235 | /* Warning, IO base is not yet inited */ |
236 | void __init setup_arch(char **cmdline_p) | 236 | void __init setup_arch(char **cmdline_p) |
237 | { | 237 | { |
238 | extern void do_init_bootmem(void); | ||
239 | |||
240 | /* so udelay does something sensible, assume <= 1000 bogomips */ | 238 | /* so udelay does something sensible, assume <= 1000 bogomips */ |
241 | loops_per_jiffy = 500000000 / HZ; | 239 | loops_per_jiffy = 500000000 / HZ; |
242 | 240 | ||
@@ -285,6 +283,9 @@ void __init setup_arch(char **cmdline_p) | |||
285 | /* reboot on panic */ | 283 | /* reboot on panic */ |
286 | panic_timeout = 180; | 284 | panic_timeout = 180; |
287 | 285 | ||
286 | if (ppc_md.panic) | ||
287 | setup_panic(); | ||
288 | |||
288 | init_mm.start_code = PAGE_OFFSET; | 289 | init_mm.start_code = PAGE_OFFSET; |
289 | init_mm.end_code = (unsigned long) _etext; | 290 | init_mm.end_code = (unsigned long) _etext; |
290 | init_mm.end_data = (unsigned long) _edata; | 291 | init_mm.end_data = (unsigned long) _edata; |