X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=arch%2Farm%2Fmm%2Finit.c;h=cddd684364dab2f6503d20132d8f5047615a2a52;hb=b0a2679d27408d97ce31e5f800b44227d3388b84;hp=5164069ced42f0d0176369247fa40701292ea511;hpb=27d189c02ba25851973c8582e419c0bded9f7e5b;p=mv-sheeva.git diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 5164069ced4..cddd684364d 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -297,6 +297,12 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) memblock_reserve(__pa(_stext), _end - _stext); #endif #ifdef CONFIG_BLK_DEV_INITRD + if (phys_initrd_size && + memblock_is_region_reserved(phys_initrd_start, phys_initrd_size)) { + pr_err("INITRD: 0x%08lx+0x%08lx overlaps in-use memory region - disabling initrd\n", + phys_initrd_start, phys_initrd_size); + phys_initrd_start = phys_initrd_size = 0; + } if (phys_initrd_size) { memblock_reserve(phys_initrd_start, phys_initrd_size);