]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mm/m68k: use common help functions to free reserved pages
authorJiang Liu <liuj97@gmail.com>
Mon, 29 Apr 2013 22:06:41 +0000 (15:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Apr 2013 22:54:30 +0000 (15:54 -0700)
Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/m68k/mm/init.c

index 519aad8fa812ca6ac7ce07f82abb06ae080139bf..1af2ca3411f6dbb8cd6fc23323951f6f979af168 100644 (file)
@@ -110,18 +110,7 @@ void __init paging_init(void)
 void free_initmem(void)
 {
 #ifndef CONFIG_MMU_SUN3
-       unsigned long addr;
-
-       addr = (unsigned long) __init_begin;
-       for (; addr < ((unsigned long) __init_end); addr += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(addr));
-               init_page_count(virt_to_page(addr));
-               free_page(addr);
-               totalram_pages++;
-       }
-       pr_notice("Freeing unused kernel memory: %luk freed (0x%x - 0x%x)\n",
-               (addr - (unsigned long) __init_begin) >> 10,
-               (unsigned int) __init_begin, (unsigned int) __init_end);
+       free_initmem_default(0);
 #endif /* CONFIG_MMU_SUN3 */
 }
 
@@ -213,15 +202,6 @@ void __init mem_init(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-       int pages = 0;
-       for (; start < end; start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(start));
-               init_page_count(virt_to_page(start));
-               free_page(start);
-               totalram_pages++;
-               pages++;
-       }
-       pr_notice("Freeing initrd memory: %dk freed\n",
-               pages << (PAGE_SHIFT - 10));
+       free_reserved_area(start, end, 0, "initrd");
 }
 #endif