From bea7671e0bdef63c28ca4687043d670e224733ec Mon Sep 17 00:00:00 2001
From: Jiang Liu <liuj97@gmail.com>
Date: Mon, 29 Apr 2013 15:06:53 -0700
Subject: [PATCH] --- yaml --- r: 365375 b: refs/heads/master c:
 bced0e32f6bdf4e2584bc9df58e3fbebaaf42bef h: refs/heads/master i:   365373:
 a9b3bdf0d8f2989ff37ca8d94cea488fbcc981b3   365371:
 ed67338e496646531989c7745ec2265c5835380e   365367:
 de31ea58dfddce6d28bb6f7b093b694a7c14bea9   365359:
 97f5d89036b079117d0e902a0fe3d4f77d268878   365343:
 4dad2e01b0158b17d28dee82a5c184e9811f8e27   365311:
 6535af670fc31a4200fdb19a4b6194cec0a75dc1 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init.c    | 5 +----
 trunk/arch/x86/mm/init_64.c | 5 ++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 05ecf878f5a1..f858fda1d476 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccecb510a9b58f1e30a45f35897842f915c24c62
+refs/heads/master: bced0e32f6bdf4e2584bc9df58e3fbebaaf42bef
diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c
index 59b7fc453277..fdc5dca14fb3 100644
--- a/trunk/arch/x86/mm/init.c
+++ b/trunk/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/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c
index 474e28f10815..2ef81f19bd6c 100644
--- a/trunk/arch/x86/mm/init_64.c
+++ b/trunk/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);