aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorJiang Liu <liuj97@gmail.com>2013-04-29 18:06:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 18:54:30 -0400
commit920f1ad081ddc38f0307a2c2bffa704769226249 (patch)
tree66d755b96bcdaf8c8048c911982d808a241857fa /arch/m68k
parent8be65857f2a4c1f83ef6d2714b7a6428a6fa386c (diff)
mm/m68k: use common help functions to free reserved pages
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>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/mm/init.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 519aad8fa812..1af2ca3411f6 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -110,18 +110,7 @@ void __init paging_init(void)
110void free_initmem(void) 110void free_initmem(void)
111{ 111{
112#ifndef CONFIG_MMU_SUN3 112#ifndef CONFIG_MMU_SUN3
113 unsigned long addr; 113 free_initmem_default(0);
114
115 addr = (unsigned long) __init_begin;
116 for (; addr < ((unsigned long) __init_end); addr += PAGE_SIZE) {
117 ClearPageReserved(virt_to_page(addr));
118 init_page_count(virt_to_page(addr));
119 free_page(addr);
120 totalram_pages++;
121 }
122 pr_notice("Freeing unused kernel memory: %luk freed (0x%x - 0x%x)\n",
123 (addr - (unsigned long) __init_begin) >> 10,
124 (unsigned int) __init_begin, (unsigned int) __init_end);
125#endif /* CONFIG_MMU_SUN3 */ 114#endif /* CONFIG_MMU_SUN3 */
126} 115}
127 116
@@ -213,15 +202,6 @@ void __init mem_init(void)
213#ifdef CONFIG_BLK_DEV_INITRD 202#ifdef CONFIG_BLK_DEV_INITRD
214void free_initrd_mem(unsigned long start, unsigned long end) 203void free_initrd_mem(unsigned long start, unsigned long end)
215{ 204{
216 int pages = 0; 205 free_reserved_area(start, end, 0, "initrd");
217 for (; start < end; start += PAGE_SIZE) {
218 ClearPageReserved(virt_to_page(start));
219 init_page_count(virt_to_page(start));
220 free_page(start);
221 totalram_pages++;
222 pages++;
223 }
224 pr_notice("Freeing initrd memory: %dk freed\n",
225 pages << (PAGE_SHIFT - 10));
226} 206}
227#endif 207#endif