From fcf1609b24a828652780e81151b80704c5dbe906 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 6 Jul 2010 15:39:07 -0700 Subject: [PATCH] --- yaml --- r: 212699 b: refs/heads/master c: 449e8df39d3f94a69deae8341f157f6ef5999015 h: refs/heads/master i: 212697: 74f889af7e326bbac143d10b1d911bbecd24fb47 212695: e5d3eb44229f2f51f2b10d407b9b18eab4420d48 v: v3 --- [refs] | 2 +- trunk/mm/memblock.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 035944729466..4ab3c7827533 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf23c51f1f49d3960f3cd8e3d2e7f943d9c41042 +refs/heads/master: 449e8df39d3f94a69deae8341f157f6ef5999015 diff --git a/trunk/mm/memblock.c b/trunk/mm/memblock.c index 3c474502d92b..a925866e1455 100644 --- a/trunk/mm/memblock.c +++ b/trunk/mm/memblock.c @@ -13,6 +13,7 @@ #include #include #include +#include #include struct memblock memblock; @@ -112,6 +113,10 @@ void __init memblock_init(void) memblock.reserved.regions = memblock_reserved_init_regions; memblock.reserved.max = INIT_MEMBLOCK_REGIONS; + /* Write a marker in the unused last array entry */ + memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE; + memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE; + /* Create a dummy zero size MEMBLOCK which will get coalesced away later. * This simplifies the memblock_add() code below... */ @@ -131,6 +136,12 @@ void __init memblock_analyze(void) { int i; + /* Check marker in the unused last array entry */ + WARN_ON(memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS].base + != (phys_addr_t)RED_INACTIVE); + WARN_ON(memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS].base + != (phys_addr_t)RED_INACTIVE); + memblock.memory_size = 0; for (i = 0; i < memblock.memory.cnt; i++)