mm/blackfin: use common help functions to free reserved pages
authorJiang Liu <liuj97@gmail.com>
Mon, 29 Apr 2013 22:06:33 +0000 (15:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Apr 2013 22:54:29 +0000 (15:54 -0700)
Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/blackfin/mm/init.c

index 9cb8553..82d01a7 100644 (file)
@@ -103,7 +103,7 @@ void __init mem_init(void)
        max_mapnr = num_physpages = MAP_NR(high_memory);
        printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", num_physpages);
 
-       /* This will put all memory onto the freelists. */
+       /* This will put all low memory onto the freelists. */
        totalram_pages = free_all_bootmem();
 
        reservedpages = 0;
@@ -129,24 +129,11 @@ void __init mem_init(void)
                initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));
 }
 
-static void __init free_init_pages(const char *what, unsigned long begin, unsigned long end)
-{
-       unsigned long addr;
-       /* next 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++;
-       }
-       printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
-}
-
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
 #ifndef CONFIG_MPU
-       free_init_pages("initrd memory", start, end);
+       free_reserved_area(start, end, 0, "initrd");
 #endif
 }
 #endif
@@ -154,10 +141,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
 void __init_refok free_initmem(void)
 {
 #if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU
-       free_init_pages("unused kernel memory",
-                       (unsigned long)(&__init_begin),
-                       (unsigned long)(&__init_end));
-
+       free_initmem_default(0);
        if (memory_start == (unsigned long)(&__init_end))
                memory_start = (unsigned long)(&__init_begin);
 #endif