From 0b3e603e9a7a92d87118cb4428468238ace1c29c Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Fri, 13 Jun 2008 20:07:03 -0700
Subject: [PATCH] --- yaml --- r: 99759 b: refs/heads/master c:
 9a27f5c51629c3d3b7718dd4be3d2722b472fafe h: refs/heads/master i:   99757:
 f16f012025ad9a3804dc923062c8878e4566f99d   99755:
 09e834b18f66a77f8b3173abd0afc00480662639   99751:
 f7e4bf0bf2b100684104ec553353c321f10d1559   99743:
 d42542a51639e162c9cf232f078be56841e765d8 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/x86/kernel/setup_32.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0de0fa236318..fca71e434371 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc1050bafebfb1d7935331282e948b5016318192
+refs/heads/master: 9a27f5c51629c3d3b7718dd4be3d2722b472fafe
diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c
index 1d4be07e15e5..72b11d4557b7 100644
--- a/trunk/arch/x86/kernel/setup_32.c
+++ b/trunk/arch/x86/kernel/setup_32.c
@@ -584,6 +584,9 @@ static void __init relocate_initrd(void)
 	printk(KERN_INFO "Copied RAMDISK from %016llx - %016llx to %08llx - %08llx\n",
 		ramdisk_image, ramdisk_image + ramdisk_size - 1,
 		ramdisk_here, ramdisk_here + ramdisk_size - 1);
+
+	/* need to free that, otherwise init highmem will reserve it again */
+	free_early(ramdisk_image, ramdisk_image+ramdisk_size);
 }
 
 #endif /* CONFIG_BLK_DEV_INITRD */
@@ -801,10 +804,6 @@ void __init setup_arch(char **cmdline_p)
 		init_ohci1394_dma_on_all_controllers();
 #endif
 
-	remapped_pgdat_init();
-	sparse_init();
-	zone_sizes_init();
-
 	/*
 	 * NOTE: at this point the bootmem allocator is fully available.
 	 */
@@ -813,6 +812,10 @@ void __init setup_arch(char **cmdline_p)
 	relocate_initrd();
 #endif
 
+	remapped_pgdat_init();
+	sparse_init();
+	zone_sizes_init();
+
 	paravirt_post_allocator_init();
 
 	dmi_scan_machine();