---

yaml
---
r: 99759
b: refs/heads/master
c: 9a27f5c
h: refs/heads/master
i:
  99757: f16f012
  99755: 09e834b
  99751: f7e4bf0
  99743: d42542a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc1050bafebfb1d7935331282e948b5016318192
+refs/heads/master: 9a27f5c51629c3d3b7718dd4be3d2722b472fafe

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();