1 files changed, 21 insertions, 41 deletions

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 9b973e0af9cb..4e73f10a7519 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -359,11 +359,24 @@ void __init paging_init(void)
 static struct kcore_list kcore_kseg0;
 #endif
 
-void __init mem_init(void)
+static inline void mem_init_free_highmem(void)
 {
-        unsigned long codesize, reservedpages, datasize, initsize;
-        unsigned long tmp, ram;
+#ifdef CONFIG_HIGHMEM
+        unsigned long tmp;
 
+        for (tmp = highstart_pfn; tmp < highend_pfn; tmp++) {
+                struct page *page = pfn_to_page(tmp);
+
+                if (!page_is_ram(tmp))
+                        SetPageReserved(page);
+                else
+                        free_highmem_page(page);
+        }
+#endif
+}
+
+void __init mem_init(void)
+{
 #ifdef CONFIG_HIGHMEM
 #ifdef CONFIG_DISCONTIGMEM
 #error "CONFIG_HIGHMEM and CONFIG_DISCONTIGMEM dont work together yet"
@@ -374,34 +387,10 @@ void __init mem_init(void)
 #endif
         high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
 
-        totalram_pages += free_all_bootmem();
+        free_all_bootmem();
         setup_zero_pages();     /* Setup zeroed pages.  */
-
-        reservedpages = ram = 0;
-        for (tmp = 0; tmp < max_low_pfn; tmp++)
-                if (page_is_ram(tmp) && pfn_valid(tmp)) {
-                        ram++;
-                        if (PageReserved(pfn_to_page(tmp)))
-                                reservedpages++;
-                }
-        num_physpages = ram;
-
-#ifdef CONFIG_HIGHMEM
-        for (tmp = highstart_pfn; tmp < highend_pfn; tmp++) {
-                struct page *page = pfn_to_page(tmp);
-
-                if (!page_is_ram(tmp)) {
-                        SetPageReserved(page);
-                        continue;
-                }
-                free_highmem_page(page);
-        }
-        num_physpages += totalhigh_pages;
-#endif
-
-        codesize =  (unsigned long) &_etext - (unsigned long) &_text;
-        datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
-        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
+        mem_init_free_highmem();
+        mem_init_print_info(NULL);
 
 #ifdef CONFIG_64BIT
         if ((unsigned long) &_text > (unsigned long) CKSEG0)
@@ -410,16 +399,6 @@ void __init mem_init(void)
                 kclist_add(&kcore_kseg0, (void *) CKSEG0,
                                 0x80000000 - 4, KCORE_TEXT);
 #endif
-
-        printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
-               "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
-               nr_free_pages() << (PAGE_SHIFT-10),
-               ram << (PAGE_SHIFT-10),
-               codesize >> 10,
-               reservedpages << (PAGE_SHIFT-10),
-               datasize >> 10,
-               initsize >> 10,
-               totalhigh_pages << (PAGE_SHIFT-10));
 }
 #endif /* !CONFIG_NEED_MULTIPLE_NODES */
 
@@ -440,7 +419,8 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd");
+        free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
+                           "initrd");
 }
 #endif