aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-07-03 15:04:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:36 -0700
commit132de6717c47f6fb1d4d3ccd6033cd45aee8f779 (patch)
treeddf53636188e9da4d91badb746575921c04ccac7
parentmm/m68k: prepare for removing num_physpages and simplify mem_init() (diff)
downloadlinux-dev-132de6717c47f6fb1d4d3ccd6033cd45aee8f779.tar.xz
linux-dev-132de6717c47f6fb1d4d3ccd6033cd45aee8f779.zip
mm/metag: prepare for removing num_physpages and simplify mem_init()
Prepare for removing num_physpages and simplify mem_init(). Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/metag/mm/init.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c
index ce81d7c43983..e0862b7ecd6e 100644
--- a/arch/metag/mm/init.c
+++ b/arch/metag/mm/init.c
@@ -388,22 +388,16 @@ void __init mem_init(void)
reset_all_zones_managed_pages();
for (tmp = highstart_pfn; tmp < highend_pfn; tmp++)
free_highmem_page(pfn_to_page(tmp));
- num_physpages += totalhigh_pages;
#endif /* CONFIG_HIGHMEM */
for_each_online_node(nid) {
pg_data_t *pgdat = NODE_DATA(nid);
- num_physpages += pgdat->node_present_pages;
-
if (pgdat->node_spanned_pages)
free_all_bootmem_node(pgdat);
}
- pr_info("Memory: %luk/%luk available\n",
- (unsigned long)nr_free_pages() << (PAGE_SHIFT - 10),
- num_physpages << (PAGE_SHIFT - 10));
-
+ mem_init_print_info(NULL);
show_mem(0);
return;