Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a27f5c5 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

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: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cc1050ba

arch/x86/kernel/setup_32.c

+7 −4
Original line number Diff line number Diff line
@@ -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();