From cceef758485266805c00acbc59740451e7dcc620 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 27 Oct 2010 19:35:29 +0100 Subject: [PATCH] --- yaml --- r: 221030 b: refs/heads/master c: 47ea3c15498154f634c304e08dee284efdd7dceb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 449168447999..2f1d537dc9ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a801d2764033063b313d0c55704de8fb36e1efd1 +refs/heads/master: 47ea3c15498154f634c304e08dee284efdd7dceb diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index 8e1edbc6116f..58b90ad4949f 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/arch/arm/mm/init.c @@ -444,6 +444,7 @@ static void __init free_unused_memmap(struct meminfo *mi) void __init mem_init(void) { unsigned long reserved_pages, free_pages; + struct memblock_region *reg; int i; #ifdef CONFIG_HAVE_TCM /* These pointers are filled in on TCM detection */ @@ -503,9 +504,11 @@ void __init mem_init(void) */ printk(KERN_INFO "Memory:"); num_physpages = 0; - for (i = 0; i < meminfo.nr_banks; i++) { - num_physpages += bank_pfn_size(&meminfo.bank[i]); - printk(" %ldMB", bank_phys_size(&meminfo.bank[i]) >> 20); + for_each_memblock(memory, reg) { + unsigned long pages = memblock_region_memory_end_pfn(reg) - + memblock_region_memory_base_pfn(reg); + num_physpages += pages; + printk(" %ldMB", pages >> (20 - PAGE_SHIFT)); } printk(" = %luMB total\n", num_physpages >> (20 - PAGE_SHIFT));