diff options
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 3e8f106ee5fe..ac1d883460c7 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -345,10 +345,11 @@ void __init arm_memblock_init(struct meminfo *mi, | |||
345 | #endif | 345 | #endif |
346 | #ifdef CONFIG_BLK_DEV_INITRD | 346 | #ifdef CONFIG_BLK_DEV_INITRD |
347 | /* FDT scan will populate initrd_start */ | 347 | /* FDT scan will populate initrd_start */ |
348 | if (initrd_start) { | 348 | if (initrd_start && !phys_initrd_size) { |
349 | phys_initrd_start = __virt_to_phys(initrd_start); | 349 | phys_initrd_start = __virt_to_phys(initrd_start); |
350 | phys_initrd_size = initrd_end - initrd_start; | 350 | phys_initrd_size = initrd_end - initrd_start; |
351 | } | 351 | } |
352 | initrd_start = initrd_end = 0; | ||
352 | if (phys_initrd_size && | 353 | if (phys_initrd_size && |
353 | !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) { | 354 | !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) { |
354 | pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n", | 355 | pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n", |