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

Commit 2b8106a0 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86_64: do not reserve ramdisk two times 



ramdisk is reserved via reserve_early in x86_64_start_kernel,
later early_res_to_bootmem() will convert to reservation in bootmem.

so don't need to reserve that again.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4a3575fd

arch/x86/kernel/head64.c

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ void __init x86_64_start_kernel(char * real_mode_data) 


	reserve_early(__pa_symbol(&_text), __pa_symbol(&_end), "TEXT DATA BSS");



#ifdef CONFIG_BLK_DEV_INITRD

	/* Reserve INITRD */

	if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {

		unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
@@ -153,6 +154,7 @@ void __init x86_64_start_kernel(char * real_mode_data) 
		unsigned long ramdisk_end   = ramdisk_image + ramdisk_size;

		reserve_early(ramdisk_image, ramdisk_end, "RAMDISK");

	}

#endif



	reserve_ebda_region();

arch/x86/kernel/setup_64.c

+5 −2
Original line number Diff line number Diff line
@@ -420,11 +420,14 @@ void __init setup_arch(char **cmdline_p) 
		unsigned long end_of_mem    = end_pfn << PAGE_SHIFT;



		if (ramdisk_end <= end_of_mem) {

			reserve_bootmem_generic(ramdisk_image, ramdisk_size);

			/*

			 * don't need to reserve again, already reserved early

			 * in x86_64_start_kernel, and early_res_to_bootmem

			 * convert that to reserved in bootmem

			 */

			initrd_start = ramdisk_image + PAGE_OFFSET;

			initrd_end = initrd_start+ramdisk_size;

		} else {

			/* Assumes everything on node 0 */

			free_bootmem(ramdisk_image, ramdisk_size);

			printk(KERN_ERR "initrd extends beyond end of memory "

			       "(0x%08lx > 0x%08lx)\ndisabling initrd\n",