1 files changed, 6 insertions, 39 deletions

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index b3940b6b4d7e..104d56a9245f 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -712,36 +712,22 @@ EXPORT_SYMBOL_GPL(arch_add_memory);
 
 static void __meminit free_pagetable(struct page *page, int order)
 {
-        struct zone *zone;
-        bool bootmem = false;
         unsigned long magic;
         unsigned int nr_pages = 1 << order;
 
         /* bootmem page has reserved flag */
         if (PageReserved(page)) {
                 __ClearPageReserved(page);
-                bootmem = true;
 
                 magic = (unsigned long)page->lru.next;
                 if (magic == SECTION_INFO || magic == MIX_SECTION_INFO) {
                         while (nr_pages--)
                                 put_page_bootmem(page++);
                 } else
-                        __free_pages_bootmem(page, order);
+                        while (nr_pages--)
+                                free_reserved_page(page++);
         } else
                 free_pages((unsigned long)page_address(page), order);
-
-        /*
-         * SECTION_INFO pages and MIX_SECTION_INFO pages
-         * are all allocated by bootmem.
-         */
-        if (bootmem) {
-                zone = page_zone(page);
-                zone_span_writelock(zone);
-                zone->present_pages += nr_pages;
-                zone_span_writeunlock(zone);
-                totalram_pages += nr_pages;
-        }
 }
 
 static void __meminit free_pte_table(pte_t *pte_start, pmd_t *pmd)
@@ -1058,9 +1044,6 @@ static void __init register_page_bootmem_info(void)
 
 void __init mem_init(void)
 {
-        long codesize, reservedpages, datasize, initsize;
-        unsigned long absent_pages;
-
         pci_iommu_alloc();
 
         /* clear_bss() already clear the empty_zero_page */
@@ -1068,29 +1051,14 @@ void __init mem_init(void)
         register_page_bootmem_info();
 
         /* this will put all memory onto the freelists */
-        totalram_pages = free_all_bootmem();
-
-        absent_pages = absent_pages_in_range(0, max_pfn);
-        reservedpages = max_pfn - totalram_pages - absent_pages;
+        free_all_bootmem();
         after_bootmem = 1;
 
-        codesize =  (unsigned long) &_etext - (unsigned long) &_text;
-        datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
-        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
-
         /* Register memory areas for /proc/kcore */
         kclist_add(&kcore_vsyscall, (void *)VSYSCALL_START,
                          VSYSCALL_END - VSYSCALL_START, KCORE_OTHER);
 
-        printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
-                         "%ldk absent, %ldk reserved, %ldk data, %ldk init)\n",
-                nr_free_pages() << (PAGE_SHIFT-10),
-                max_pfn << (PAGE_SHIFT-10),
-                codesize >> 10,
-                absent_pages << (PAGE_SHIFT-10),
-                reservedpages << (PAGE_SHIFT-10),
-                datasize >> 10,
-                initsize >> 10);
+        mem_init_print_info(NULL);
 }
 
 #ifdef CONFIG_DEBUG_RODATA
@@ -1166,11 +1134,10 @@ void mark_rodata_ro(void)
         set_memory_ro(start, (end-start) >> PAGE_SHIFT);
 #endif
 
-        free_init_pages("unused kernel memory",
+        free_init_pages("unused kernel",
                         (unsigned long) __va(__pa_symbol(text_end)),
                         (unsigned long) __va(__pa_symbol(rodata_start)));
-
-        free_init_pages("unused kernel memory",
+        free_init_pages("unused kernel",
                         (unsigned long) __va(__pa_symbol(rodata_end)),
                         (unsigned long) __va(__pa_symbol(_sdata)));
 }