Skip to content

Commit

Permalink
mm/x86: use common help functions to free reserved pages
Browse files Browse the repository at this point in the history
Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jiang Liu authored and Linus Torvalds committed Apr 29, 2013
1 parent ccecb51 commit bced0e3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
5 changes: 1 addition & 4 deletions arch/x86/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -515,11 +515,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);

for (; addr < end; addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
free_page(addr);
totalram_pages++;
free_reserved_page(virt_to_page(addr));
}
#endif
}
Expand Down
5 changes: 2 additions & 3 deletions arch/x86/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -1067,10 +1067,9 @@ void __init mem_init(void)

/* clear_bss() already clear the empty_zero_page */

reservedpages = 0;

/* this will put all low memory onto the freelists */
register_page_bootmem_info();

/* this will put all memory onto the freelists */
totalram_pages = free_all_bootmem();

absent_pages = absent_pages_in_range(0, max_pfn);
Expand Down

0 comments on commit bced0e3

Please sign in to comment.