Commit 8be65857 authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds

mm/m32r: use common help functions to free reserved pages

Use common help functions to free reserved pages.
Also include <asm/sections.h> to avoid local declarations.
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 66f62594
...@@ -28,10 +28,7 @@ ...@@ -28,10 +28,7 @@
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/sections.h>
/* References to section boundaries */
extern char _text, _etext, _edata;
extern char __init_begin, __init_end;
pgd_t swapper_pg_dir[1024]; pgd_t swapper_pg_dir[1024];
...@@ -184,17 +181,7 @@ void __init mem_init(void) ...@@ -184,17 +181,7 @@ void __init mem_init(void)
*======================================================================*/ *======================================================================*/
void free_initmem(void) void free_initmem(void)
{ {
unsigned long addr; free_initmem_default(0);
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++;
}
printk (KERN_INFO "Freeing unused kernel memory: %dk freed\n", \
(int)(&__init_end - &__init_begin) >> 10);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
...@@ -204,13 +191,6 @@ void free_initmem(void) ...@@ -204,13 +191,6 @@ void free_initmem(void)
*======================================================================*/ *======================================================================*/
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
unsigned long p; free_reserved_area(start, end, 0, "initrd");
for (p = start; p < end; p += PAGE_SIZE) {
ClearPageReserved(virt_to_page(p));
init_page_count(virt_to_page(p));
free_page(p);
totalram_pages++;
}
printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
} }
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment