Merge tag 'arc-v3.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index 6634cf50e3b4660b74daf4d7df89aeaf905888a5..4a177365b2c42a94abe000ec4d9de016e7f48abb 100644 (file)
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -141,37 +141,18 @@ void __init mem_init(void)
                PAGES_TO_KB(reserved_pages));
 }
 
-static void __init free_init_pages(const char *what, unsigned long begin,
-                                  unsigned long end)
-{
-       unsigned long addr;
-
-       pr_info("Freeing %s: %ldk [%lx] to [%lx]\n",
-               what, TO_KB(end - begin), begin, end);
-
-       /* need to check that the page we free is not a partial page */
-       for (addr = begin; addr + PAGE_SIZE <= end; addr += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(addr));
-               init_page_count(virt_to_page(addr));
-               free_page(addr);
-               totalram_pages++;
-       }
-}
-
 /*
  * free_initmem: Free all the __init memory.
  */
 void __init_refok free_initmem(void)
 {
-       free_init_pages("unused kernel memory",
-                       (unsigned long)__init_begin,
-                       (unsigned long)__init_end);
+       free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-       free_init_pages("initrd memory", start, end);
+       free_reserved_area(start, end, 0, "initrd");
 }
 #endif