mm/PARISC: 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 E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index b4edc76c6f225a63aa856d1827fa72f6d87d2831..b0f96c0e6316f15531afb2a5a2a0e4684d1892a8 100644 (file)
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -585,18 +585,8 @@ void __init mem_init(void)
                        > BITS_PER_LONG);
 
        high_memory = __va((max_pfn << PAGE_SHIFT));
-
-#ifndef CONFIG_DISCONTIGMEM
-       max_mapnr = page_to_pfn(virt_to_page(high_memory - 1)) + 1;
+       set_max_mapnr(page_to_pfn(virt_to_page(high_memory - 1)) + 1);
        free_all_bootmem();
-#else
-       {
-               int i;
-
-               for (i = 0; i < npmem_ranges; i++)
-                       free_all_bootmem_node(NODE_DATA(i));
-       }
-#endif
 
 #ifdef CONFIG_PA11
        if (hppa_dma_ops == &pcxl_dma_ops) {