Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next

[~andy/linux] / arch / mn10300 / mm / init.c

diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c
index 5a8ace63a6b48188a6efbdc852f1d6c530d4913f..97a1ec0beeecf2fd5dd538eda613b3bbcfa5346b 100644 (file)
--- a/arch/mn10300/mm/init.c
+++ b/arch/mn10300/mm/init.c
@@ -99,43 +99,21 @@ void __init paging_init(void)
  */
 void __init mem_init(void)
 {
-       int codesize, reservedpages, datasize, initsize;
-       int tmp;
-
        BUG_ON(!mem_map);
 
 #define START_PFN      (contig_page_data.bdata->node_min_pfn)
 #define MAX_LOW_PFN    (contig_page_data.bdata->node_low_pfn)
 
-       max_mapnr = num_physpages = MAX_LOW_PFN - START_PFN;
+       max_mapnr = MAX_LOW_PFN - START_PFN;
        high_memory = (void *) __va(MAX_LOW_PFN * PAGE_SIZE);
 
        /* clear the zero-page */
        memset(empty_zero_page, 0, PAGE_SIZE);
 
        /* this will put all low memory onto the freelists */
-       totalram_pages += free_all_bootmem();
-
-       reservedpages = 0;
-       for (tmp = 0; tmp < num_physpages; tmp++)
-               if (PageReserved(&mem_map[tmp]))
-                       reservedpages++;
-
-       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"
-              " (%dk kernel code, %dk reserved, %dk data, %dk init,"
-              " %ldk highmem)\n",
-              nr_free_pages() << (PAGE_SHIFT - 10),
-              max_mapnr << (PAGE_SHIFT - 10),
-              codesize >> 10,
-              reservedpages << (PAGE_SHIFT - 10),
-              datasize >> 10,
-              initsize >> 10,
-              totalhigh_pages << (PAGE_SHIFT - 10));
+       free_all_bootmem();
+
+       mem_init_print_info(NULL);
 }
 
 /*
@@ -152,6 +130,7 @@ void free_initmem(void)
 #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