1 files changed, 9 insertions, 34 deletions

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 20f9ead650d3..33890fd267cb 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -407,30 +407,16 @@ unsigned int mem_init_done = 0;
 
 void __init mem_init(void)
 {
-        int codesize, datasize, initsize;
-        int nid;
+        pg_data_t *pgdat;
 
         iommu_init();
 
-        num_physpages = 0;
         high_memory = NULL;
+        for_each_online_pgdat(pgdat)
+                high_memory = max_t(void *, high_memory,
+                                    __va(pgdat_end_pfn(pgdat) << PAGE_SHIFT));
 
-        for_each_online_node(nid) {
-                pg_data_t *pgdat = NODE_DATA(nid);
-                void *node_high_memory;
-
-                num_physpages += pgdat->node_present_pages;
-
-                if (pgdat->node_spanned_pages)
-                        totalram_pages += free_all_bootmem_node(pgdat);
-
-
-                node_high_memory = (void *)__va((pgdat->node_start_pfn +
-                                                 pgdat->node_spanned_pages) <<
-                                                 PAGE_SHIFT);
-                if (node_high_memory > high_memory)
-                        high_memory = node_high_memory;
-        }
+        free_all_bootmem();
 
         /* Set this up early, so we can take care of the zero page */
         cpu_cache_init();
@@ -441,19 +427,8 @@ void __init mem_init(void)
 
         vsyscall_init();
 
-        codesize =  (unsigned long) &_etext - (unsigned long) &_text;
-        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 data, %dk init)\n",
-                nr_free_pages() << (PAGE_SHIFT-10),
-                num_physpages << (PAGE_SHIFT-10),
-                codesize >> 10,
-                datasize >> 10,
-                initsize >> 10);
-
-        printk(KERN_INFO "virtual kernel memory layout:\n"
+        mem_init_print_info(NULL);
+        pr_info("virtual kernel memory layout:\n"
                 "    fixmap  : 0x%08lx - 0x%08lx   (%4ld kB)\n"
 #ifdef CONFIG_HIGHMEM
                 "    pkmap   : 0x%08lx - 0x%08lx   (%4ld kB)\n"
@@ -499,13 +474,13 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-        free_initmem_default(0);
+        free_initmem_default(-1);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_reserved_area(start, end, 0, "initrd");
+        free_reserved_area((void *)start, (void *)end, -1, "initrd");
 }
 #endif