diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-07-03 18:04:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:38 -0400 |
commit | b57b63a2ace84d09c6fc270150d0408ddef1efa7 (patch) | |
tree | ca67f39cbc925c0e3bbe8dd63f188f249a85dc6b /arch/ia64/mm | |
parent | ce7549e1d824e08871beddb6c7945635dfc4341d (diff) |
mm/IA64: 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: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/mm')
-rw-r--r-- | arch/ia64/mm/init.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 2d372b4c5f70..b6f7f43424ec 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -583,7 +583,6 @@ __setup("nolwsys", nolwsys_setup); | |||
583 | void __init | 583 | void __init |
584 | mem_init (void) | 584 | mem_init (void) |
585 | { | 585 | { |
586 | pg_data_t *pgdat; | ||
587 | int i; | 586 | int i; |
588 | 587 | ||
589 | BUG_ON(PTRS_PER_PGD * sizeof(pgd_t) != PAGE_SIZE); | 588 | BUG_ON(PTRS_PER_PGD * sizeof(pgd_t) != PAGE_SIZE); |
@@ -601,15 +600,11 @@ mem_init (void) | |||
601 | 600 | ||
602 | #ifdef CONFIG_FLATMEM | 601 | #ifdef CONFIG_FLATMEM |
603 | BUG_ON(!mem_map); | 602 | BUG_ON(!mem_map); |
604 | max_mapnr = max_low_pfn; | ||
605 | #endif | 603 | #endif |
606 | 604 | ||
605 | set_max_mapnr(max_low_pfn); | ||
607 | high_memory = __va(max_low_pfn * PAGE_SIZE); | 606 | high_memory = __va(max_low_pfn * PAGE_SIZE); |
608 | 607 | free_all_bootmem(); | |
609 | for_each_online_pgdat(pgdat) | ||
610 | if (pgdat->bdata->node_bootmem_map) | ||
611 | free_all_bootmem_node(pgdat); | ||
612 | |||
613 | mem_init_print_info(NULL); | 608 | mem_init_print_info(NULL); |
614 | 609 | ||
615 | /* | 610 | /* |