Merge tag 'metag-fixes-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / score / mm / init.c

diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c
index 0940682ab38bdd700227226e22803e6310096aa5..9fbce49ad3bdd4304226aa767c8f5b2fcd2e0a49 100644 (file)
--- a/arch/score/mm/init.c
+++ b/arch/score/mm/init.c
@@ -75,40 +75,19 @@ void __init paging_init(void)
 
 void __init mem_init(void)
 {
-       unsigned long codesize, reservedpages, datasize, initsize;
-       unsigned long tmp, ram = 0;
-
        high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
-       totalram_pages += free_all_bootmem();
+       free_all_bootmem();
        setup_zero_page();      /* Setup zeroed pages. */
-       reservedpages = 0;
-
-       for (tmp = 0; tmp < max_low_pfn; tmp++)
-               if (page_is_ram(tmp)) {
-                       ram++;
-                       if (PageReserved(pfn_to_page(tmp)))
-                               reservedpages++;
-               }
-
-       num_physpages = ram;
-       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 (%ldk kernel code, "
-                       "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
-                       (unsigned long) 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));
+
+       mem_init_print_info(NULL);
 }
 #endif /* !CONFIG_NEED_MULTIPLE_NODES */
 
 #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