提交 7265d80f 编写于 作者: J Jiang Liu 提交者: Linus Torvalds

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

Use common help functions to free reserved pages.
Signed-off-by: NJiang Liu <jiang.liu@huawei.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 0999f119
...@@ -43,7 +43,7 @@ EXPORT_SYMBOL_GPL(empty_zero_page); ...@@ -43,7 +43,7 @@ EXPORT_SYMBOL_GPL(empty_zero_page);
static struct kcore_list kcore_mem, kcore_vmalloc; static struct kcore_list kcore_mem, kcore_vmalloc;
static unsigned long setup_zero_page(void) static void setup_zero_page(void)
{ {
struct page *page; struct page *page;
...@@ -52,9 +52,7 @@ static unsigned long setup_zero_page(void) ...@@ -52,9 +52,7 @@ static unsigned long setup_zero_page(void)
panic("Oh boy, that early out of memory?"); panic("Oh boy, that early out of memory?");
page = virt_to_page((void *) empty_zero_page); page = virt_to_page((void *) empty_zero_page);
SetPageReserved(page); mark_page_reserved(page);
return 1UL;
} }
#ifndef CONFIG_NEED_MULTIPLE_NODES #ifndef CONFIG_NEED_MULTIPLE_NODES
...@@ -84,7 +82,7 @@ void __init mem_init(void) ...@@ -84,7 +82,7 @@ void __init mem_init(void)
high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT); high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
totalram_pages += free_all_bootmem(); totalram_pages += free_all_bootmem();
totalram_pages -= setup_zero_page(); /* Setup zeroed pages. */ setup_zero_page(); /* Setup zeroed pages. */
reservedpages = 0; reservedpages = 0;
for (tmp = 0; tmp < max_low_pfn; tmp++) for (tmp = 0; tmp < max_low_pfn; tmp++)
...@@ -109,37 +107,16 @@ void __init mem_init(void) ...@@ -109,37 +107,16 @@ void __init mem_init(void)
} }
#endif /* !CONFIG_NEED_MULTIPLE_NODES */ #endif /* !CONFIG_NEED_MULTIPLE_NODES */
static void free_init_pages(const char *what, unsigned long begin, unsigned long end)
{
unsigned long pfn;
for (pfn = PFN_UP(begin); pfn < PFN_DOWN(end); pfn++) {
struct page *page = pfn_to_page(pfn);
void *addr = phys_to_virt(PFN_PHYS(pfn));
ClearPageReserved(page);
init_page_count(page);
memset(addr, POISON_FREE_INITMEM, PAGE_SIZE);
__free_page(page);
totalram_pages++;
}
printk(KERN_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)
{ {
free_init_pages("initrd memory", free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd");
virt_to_phys((void *) start),
virt_to_phys((void *) end));
} }
#endif #endif
void __init_refok free_initmem(void) void __init_refok free_initmem(void)
{ {
free_init_pages("unused kernel memory", free_initmem_default(POISON_FREE_INITMEM);
__pa(&__init_begin),
__pa(&__init_end));
} }
unsigned long pgd_current; unsigned long pgd_current;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册