mm/x86: 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>
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>

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 59b7fc453277399bd574dbde43b0bd8d295c9414..fdc5dca14fb35de5537765acca869ccfb447262d 100644 (file)
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -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
 }

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 474e28f108151c67830a6e36476ff44ab4802126..2ef81f19bd6c63d11f444a35bd803d6795300744 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -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);