diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-24 05:26:58 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-10 17:18:03 -0500 |
commit | f7b3a8355ba6cad251297844a0bdd08898ea36e0 (patch) | |
tree | 018eee7bfdbf99961e929644a761354bbea12688 /arch/powerpc/kernel/prom.c | |
parent | 2be09cb993826b52c9fc1d44747c20dd43a50038 (diff) |
of/flattree: Merge early_init_dt_check_for_initrd()
Merge common code between PowerPC and Microblaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
-rw-r--r-- | arch/powerpc/kernel/prom.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 7f8856655144..1ecd6c6ecabd 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -373,36 +373,6 @@ static int __init early_init_dt_scan_cpus(unsigned long node, | |||
373 | return 0; | 373 | return 0; |
374 | } | 374 | } |
375 | 375 | ||
376 | #ifdef CONFIG_BLK_DEV_INITRD | ||
377 | static void __init early_init_dt_check_for_initrd(unsigned long node) | ||
378 | { | ||
379 | unsigned long l; | ||
380 | u32 *prop; | ||
381 | |||
382 | DBG("Looking for initrd properties... "); | ||
383 | |||
384 | prop = of_get_flat_dt_prop(node, "linux,initrd-start", &l); | ||
385 | if (prop) { | ||
386 | initrd_start = (unsigned long)__va(of_read_ulong(prop, l/4)); | ||
387 | |||
388 | prop = of_get_flat_dt_prop(node, "linux,initrd-end", &l); | ||
389 | if (prop) { | ||
390 | initrd_end = (unsigned long) | ||
391 | __va(of_read_ulong(prop, l/4)); | ||
392 | initrd_below_start_ok = 1; | ||
393 | } else { | ||
394 | initrd_start = 0; | ||
395 | } | ||
396 | } | ||
397 | |||
398 | DBG("initrd_start=0x%lx initrd_end=0x%lx\n", initrd_start, initrd_end); | ||
399 | } | ||
400 | #else | ||
401 | static inline void early_init_dt_check_for_initrd(unsigned long node) | ||
402 | { | ||
403 | } | ||
404 | #endif /* CONFIG_BLK_DEV_INITRD */ | ||
405 | |||
406 | static int __init early_init_dt_scan_chosen(unsigned long node, | 376 | static int __init early_init_dt_scan_chosen(unsigned long node, |
407 | const char *uname, int depth, void *data) | 377 | const char *uname, int depth, void *data) |
408 | { | 378 | { |