Commit 7beb5987 authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds

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

Use common help functions to free reserved pages.
Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 920f1ad0
...@@ -46,7 +46,6 @@ void machine_shutdown(void); ...@@ -46,7 +46,6 @@ void machine_shutdown(void);
void machine_halt(void); void machine_halt(void);
void machine_power_off(void); void machine_power_off(void);
void free_init_pages(char *what, unsigned long begin, unsigned long end);
extern void *alloc_maybe_bootmem(size_t size, gfp_t mask); extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
......
...@@ -236,40 +236,16 @@ void __init setup_memory(void) ...@@ -236,40 +236,16 @@ void __init setup_memory(void)
paging_init(); paging_init();
} }
void free_init_pages(char *what, unsigned long begin, unsigned long end)
{
unsigned long addr;
for (addr = begin; addr < end; addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
free_page(addr);
totalram_pages++;
}
pr_info("Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
}
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
int pages = 0; free_reserved_area(start, end, 0, "initrd");
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",
(int)(pages * (PAGE_SIZE / 1024)));
} }
#endif #endif
void free_initmem(void) void free_initmem(void)
{ {
free_init_pages("unused kernel memory", free_initmem_default(0);
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
} }
void __init mem_init(void) void __init mem_init(void)
......
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