From 47ea3c15498154f634c304e08dee284efdd7dceb Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 27 Oct 2010 19:35:29 +0100 Subject: [PATCH] ARM: memblock: convert memory detail printing to use memblock Signed-off-by: Russell King --- arch/arm/mm/init.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 8e1edbc6116..58b90ad4949 100644 --- a/arch/arm/mm/init.c +++ b/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)); -- 2.11.4.GIT