From 9a8152c72bb68273f9f4ac12f8b5c60f6c0e25d6 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 30 Jan 2011 11:21:05 +0000 Subject: [PATCH] --- yaml --- r: 232681 b: refs/heads/master c: b0a2679d27408d97ce31e5f800b44227d3388b84 h: refs/heads/master i: 232679: 9c65a4456bf6aa2815332ecaf7c0a2bc53879da2 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 25368548aa9c..2393d59104b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f2c1b30c7f60670c8b9d1cb1ea7c818b9c743a6 +refs/heads/master: b0a2679d27408d97ce31e5f800b44227d3388b84 diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index 5164069ced42..cddd684364da 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/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);