From 01b7d5bd53bdde530d2ed3845227499b1d06130b Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Mon, 29 Apr 2013 15:06:34 -0700 Subject: [PATCH] --- yaml --- r: 365357 b: refs/heads/master c: 95a259ed28204c7692fdf902b1742e50efc07c83 h: refs/heads/master i: 365355: 458884118b25ed02f640f31a289f770f4e0d0638 v: v3 --- [refs] | 2 +- trunk/arch/c6x/mm/init.c | 30 ++---------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index ebda5ff6b9dd..07711fcab05d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed8a36f50381e3d10fa57aba4088d67e9d55b0e5 +refs/heads/master: 95a259ed28204c7692fdf902b1742e50efc07c83 diff --git a/trunk/arch/c6x/mm/init.c b/trunk/arch/c6x/mm/init.c index 89395f09648a..a9fcd89b251b 100644 --- a/trunk/arch/c6x/mm/init.c +++ b/trunk/arch/c6x/mm/init.c @@ -77,37 +77,11 @@ void __init mem_init(void) #ifdef CONFIG_BLK_DEV_INITRD void __init 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++; - } - printk(KERN_INFO "Freeing initrd memory: %luk freed\n", - (pages * PAGE_SIZE) >> 10); + free_reserved_area(start, end, 0, "initrd"); } #endif void __init free_initmem(void) { - unsigned long addr; - - /* - * The following code should be cool even if these sections - * are not page aligned. - */ - addr = PAGE_ALIGN((unsigned long)(__init_begin)); - - /* next to check that the page we free is not a partial page */ - for (; addr + PAGE_SIZE < (unsigned long)(__init_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 unused kernel memory: %dK freed\n", - (int) ((addr - PAGE_ALIGN((long) &__init_begin)) >> 10)); + free_initmem_default(0); }