diff options
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r-- | arch/powerpc/kernel/setup-common.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 89cfaf49d3de..d050d9a61bd4 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c | |||
@@ -304,26 +304,8 @@ struct seq_operations cpuinfo_op = { | |||
304 | void __init check_for_initrd(void) | 304 | void __init check_for_initrd(void) |
305 | { | 305 | { |
306 | #ifdef CONFIG_BLK_DEV_INITRD | 306 | #ifdef CONFIG_BLK_DEV_INITRD |
307 | const unsigned int *prop; | 307 | DBG(" -> check_for_initrd() initrd_start=0x%lx initrd_end=0x%lx\n", |
308 | int len; | 308 | initrd_start, initrd_end); |
309 | |||
310 | DBG(" -> check_for_initrd()\n"); | ||
311 | |||
312 | if (of_chosen) { | ||
313 | prop = get_property(of_chosen, "linux,initrd-start", &len); | ||
314 | if (prop != NULL) { | ||
315 | initrd_start = (unsigned long) | ||
316 | __va(of_read_ulong(prop, len / 4)); | ||
317 | prop = get_property(of_chosen, | ||
318 | "linux,initrd-end", &len); | ||
319 | if (prop != NULL) { | ||
320 | initrd_end = (unsigned long) | ||
321 | __va(of_read_ulong(prop, len / 4)); | ||
322 | initrd_below_start_ok = 1; | ||
323 | } else | ||
324 | initrd_start = 0; | ||
325 | } | ||
326 | } | ||
327 | 309 | ||
328 | /* If we were passed an initrd, set the ROOT_DEV properly if the values | 310 | /* If we were passed an initrd, set the ROOT_DEV properly if the values |
329 | * look sensible. If not, clear initrd reference. | 311 | * look sensible. If not, clear initrd reference. |