summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-07-03 15:04:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:38 -0700
commit5ad62f24ba22543a3b35b4f28fafd80e55eda269 (patch)
tree67036b0eed044b8f3a8c95ae068159fe4dcc42bb
parentb69a9787b1dfb2e5055fb4e0fea71f9e16c7ea01 (diff)
mm/metag: prepare for killing free_all_bootmem_node()
Prepare for killing free_all_bootmem_node() by using free_all_bootmem(). Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Cc: James Hogan <james.hogan@imgtec.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.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c
index e0862b7ecd6e..28813f164730 100644
--- a/arch/metag/mm/init.c
+++ b/arch/metag/mm/init.c
@@ -376,31 +376,21 @@ void __init paging_init(unsigned long mem_end)
void __init mem_init(void)
{
- int nid;
-
#ifdef CONFIG_HIGHMEM
unsigned long tmp;
/*
* Explicitly reset zone->managed_pages because highmem pages are
- * freed before calling free_all_bootmem_node();
+ * freed before calling free_all_bootmem();
*/
reset_all_zones_managed_pages();
for (tmp = highstart_pfn; tmp < highend_pfn; tmp++)
free_highmem_page(pfn_to_page(tmp));
#endif /* CONFIG_HIGHMEM */
- for_each_online_node(nid) {
- pg_data_t *pgdat = NODE_DATA(nid);
-
- if (pgdat->node_spanned_pages)
- free_all_bootmem_node(pgdat);
- }
-
+ free_all_bootmem();
mem_init_print_info(NULL);
show_mem(0);
-
- return;
}
void free_initmem(void)