x86: clean up relocate_initrd
1. move that before zone_sizes_init ...
2. add free_early for one old one, otherwise it will be be reserved again
when we init highmem.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 1d4be07..72b11d4 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -584,6 +584,9 @@
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 @@
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 @@
relocate_initrd();
#endif
+ remapped_pgdat_init();
+ sparse_init();
+ zone_sizes_init();
+
paravirt_post_allocator_init();
dmi_scan_machine();