diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-27 19:35:29 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 13:54:43 +0100 |
| commit | 47ea3c15498154f634c304e08dee284efdd7dceb (patch) | |
| tree | 03d407898d6d26f113a417e998e5e93518b02b90 /arch/arm/mm | |
| parent | a801d2764033063b313d0c55704de8fb36e1efd1 (diff) | |
| download | kernel_samsung_smdk4412-47ea3c15498154f634c304e08dee284efdd7dceb.tar.gz kernel_samsung_smdk4412-47ea3c15498154f634c304e08dee284efdd7dceb.tar.bz2 kernel_samsung_smdk4412-47ea3c15498154f634c304e08dee284efdd7dceb.zip | |
ARM: memblock: convert memory detail printing to use memblock
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/init.c | 9 |
1 files 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)); |