提交 47ea3c15 编写于 作者: R Russell King

ARM: memblock: convert memory detail printing to use memblock

Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 a801d276
...@@ -444,6 +444,7 @@ static void __init free_unused_memmap(struct meminfo *mi) ...@@ -444,6 +444,7 @@ static void __init free_unused_memmap(struct meminfo *mi)
void __init mem_init(void) void __init mem_init(void)
{ {
unsigned long reserved_pages, free_pages; unsigned long reserved_pages, free_pages;
struct memblock_region *reg;
int i; int i;
#ifdef CONFIG_HAVE_TCM #ifdef CONFIG_HAVE_TCM
/* These pointers are filled in on TCM detection */ /* These pointers are filled in on TCM detection */
...@@ -503,9 +504,11 @@ void __init mem_init(void) ...@@ -503,9 +504,11 @@ void __init mem_init(void)
*/ */
printk(KERN_INFO "Memory:"); printk(KERN_INFO "Memory:");
num_physpages = 0; num_physpages = 0;
for (i = 0; i < meminfo.nr_banks; i++) { for_each_memblock(memory, reg) {
num_physpages += bank_pfn_size(&meminfo.bank[i]); unsigned long pages = memblock_region_memory_end_pfn(reg) -
printk(" %ldMB", bank_phys_size(&meminfo.bank[i]) >> 20); memblock_region_memory_base_pfn(reg);
num_physpages += pages;
printk(" %ldMB", pages >> (20 - PAGE_SHIFT));
} }
printk(" = %luMB total\n", num_physpages >> (20 - PAGE_SHIFT)); printk(" = %luMB total\n", num_physpages >> (20 - PAGE_SHIFT));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册