1 files changed, 5 insertions, 36 deletions

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index d1fe4b402601..b6f7f43424ec 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -154,9 +154,8 @@ ia64_init_addr_space (void)
 void
 free_initmem (void)
 {
-        free_reserved_area((unsigned long)ia64_imva(__init_begin),
-                           (unsigned long)ia64_imva(__init_end),
-                           0, "unused kernel");
+        free_reserved_area(ia64_imva(__init_begin), ia64_imva(__init_end),
+                           -1, "unused kernel");
 }
 
 void __init
@@ -546,19 +545,6 @@ int __init register_active_ranges(u64 start, u64 len, int nid)
         return 0;
 }
 
-static int __init
-count_reserved_pages(u64 start, u64 end, void *arg)
-{
-        unsigned long num_reserved = 0;
-        unsigned long *count = arg;
-
-        for (; start < end; start += PAGE_SIZE)
-                if (PageReserved(virt_to_page(start)))
-                        ++num_reserved;
-        *count += num_reserved;
-        return 0;
-}
-
 int
 find_max_min_low_pfn (u64 start, u64 end, void *arg)
 {
@@ -597,8 +583,6 @@ __setup("nolwsys", nolwsys_setup);
 void __init
 mem_init (void)
 {
-        long reserved_pages, codesize, datasize, initsize;
-        pg_data_t *pgdat;
         int i;
 
         BUG_ON(PTRS_PER_PGD * sizeof(pgd_t) != PAGE_SIZE);
@@ -616,27 +600,12 @@ 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)
-                        totalram_pages += free_all_bootmem_node(pgdat);
-
-        reserved_pages = 0;
-        efi_memmap_walk(count_reserved_pages, &reserved_pages);
-
-        codesize =  (unsigned long) _etext - (unsigned long) _stext;
-        datasize =  (unsigned long) _edata - (unsigned long) _etext;
-        initsize =  (unsigned long) __init_end - (unsigned long) __init_begin;
-
-        printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, "
-               "%luk data, %luk init)\n", nr_free_pages() << (PAGE_SHIFT - 10),
-               num_physpages << (PAGE_SHIFT - 10), codesize >> 10,
-               reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10);
-
+        free_all_bootmem();
+        mem_init_print_info(NULL);
 
         /*
          * For fsyscall entrpoints with no light-weight handler, use the ordinary