Merge remote-tracking branch 'origin/x86/boot' into x86/mm2

[karo-tx-linux.git] / arch / sparc / mm / init_64.c

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index c3b72423c846465373e6c06ab961ac99efce4ea6..fc5a7c4bd9e8dab06e452589df3ab8b950d0ca66 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2021,6 +2021,16 @@ static void __init patch_tlb_miss_handler_bitmap(void)
        flushi(&valid_addr_bitmap_insn[0]);
 }
 
+static void __init register_page_bootmem_info(void)
+{
+#ifdef CONFIG_NEED_MULTIPLE_NODES
+       int i;
+
+       for_each_online_node(i)
+               if (NODE_DATA(i)->node_spanned_pages)
+                       register_page_bootmem_info_node(NODE_DATA(i));
+#endif
+}
 void __init mem_init(void)
 {
        unsigned long codepages, datapages, initpages;
@@ -2038,20 +2048,8 @@ void __init mem_init(void)
 
        high_memory = __va(last_valid_pfn << PAGE_SHIFT);
 
-#ifdef CONFIG_NEED_MULTIPLE_NODES
-       {
-               int i;
-               for_each_online_node(i) {
-                       if (NODE_DATA(i)->node_spanned_pages != 0) {
-                               totalram_pages +=
-                                       free_all_bootmem_node(NODE_DATA(i));
-                       }
-               }
-               totalram_pages += free_low_memory_core_early(MAX_NUMNODES);
-       }
-#else
+       register_page_bootmem_info();
        totalram_pages = free_all_bootmem();
-#endif
 
        /* We subtract one to account for the mem_map_zero page
         * allocated below.