]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mm/IA64: prepare for killing free_all_bootmem_node()
authorJiang Liu <liuj97@gmail.com>
Wed, 3 Jul 2013 22:04:25 +0000 (15:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 23:07:38 +0000 (16:07 -0700)
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>
arch/ia64/mm/init.c

index 2d372b4c5f70f27b20eb6e6f9bbe210731c4f990..b6f7f43424ec492187f558b163b525d2d4583395 100644 (file)
@@ -583,7 +583,6 @@ __setup("nolwsys", nolwsys_setup);
 void __init
 mem_init (void)
 {
-       pg_data_t *pgdat;
        int i;
 
        BUG_ON(PTRS_PER_PGD * sizeof(pgd_t) != PAGE_SIZE);
@@ -601,15 +600,11 @@ mem_init (void)
 
 #ifdef CONFIG_FLATMEM
        BUG_ON(!mem_map);
-       max_mapnr = max_low_pfn;
 #endif
 
+       set_max_mapnr(max_low_pfn);
        high_memory = __va(max_low_pfn * PAGE_SIZE);
-
-       for_each_online_pgdat(pgdat)
-               if (pgdat->bdata->node_bootmem_map)
-                       free_all_bootmem_node(pgdat);
-
+       free_all_bootmem();
        mem_init_print_info(NULL);
 
        /*