From d0fe8f59f44387b662d4eedb806b267af698a457 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Wed, 11 Apr 2012 14:52:56 +0100 Subject: [PATCH] --- yaml --- r: 299271 b: refs/heads/master c: a106b21a352517b57af1c3581e15b8787ffe4e98 h: refs/heads/master i: 299269: 7ca2b9efc9b4a9dc1b9b4e968c6d12e1d707b7aa 299267: f8dc02d655e4688d0cdb2201f8ab55d83efdfbd0 299263: e87fa65239325a1c3f3354d9be0b2860370b633e v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/compressed/atags_to_fdt.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a3805b169217..4ba8f5b9a49d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c5fd9e85f574d9d0361b2b878f55732290afe5b +refs/heads/master: a106b21a352517b57af1c3581e15b8787ffe4e98 diff --git a/trunk/arch/arm/boot/compressed/atags_to_fdt.c b/trunk/arch/arm/boot/compressed/atags_to_fdt.c index 6ce11c481178..797f04bedb47 100644 --- a/trunk/arch/arm/boot/compressed/atags_to_fdt.c +++ b/trunk/arch/arm/boot/compressed/atags_to_fdt.c @@ -77,6 +77,8 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) } else if (atag->hdr.tag == ATAG_MEM) { if (memcount >= sizeof(mem_reg_property)/4) continue; + if (!atag->u.mem.size) + continue; mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.start); mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.size); } else if (atag->hdr.tag == ATAG_INITRD2) {