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

Commit 6c902b65 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86: Merge early kernel reserve for 32bit and 64bit 



They are the same, and we could move them out from head32/64.c to setup.c.

We are using memblock, and it could handle overlapping properly, so
we don't need to reserve some at first to hold the location, and just
need to make sure we reserve them before we are using memblock to find
free mem to use.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-32-git-send-email-yinghai@kernel.org


Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 0212f915

arch/x86/kernel/head32.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -33,9 +33,6 @@ void __init i386_start_kernel(void) 
{

{

	sanitize_boot_params(&boot_params);

	sanitize_boot_params(&boot_params);





	memblock_reserve(__pa_symbol(&_text),

			 __pa_symbol(&__bss_stop) - __pa_symbol(&_text));



	/* Call the subarch specific early setup function */

	/* Call the subarch specific early setup function */

	switch (boot_params.hdr.hardware_subarch) {

	switch (boot_params.hdr.hardware_subarch) {

	case X86_SUBARCH_MRST:

	case X86_SUBARCH_MRST:
@@ -49,11 +46,5 @@ void __init i386_start_kernel(void) 
		break;

		break;

	}

	}





	/*

	 * At this point everything still needed from the boot loader

	 * or BIOS or kernel text should be early reserved or marked not

	 * RAM in e820. All other memory is free game.

	 */



	start_kernel();

	start_kernel();

}
 
}

arch/x86/kernel/head64.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -186,16 +186,7 @@ void __init x86_64_start_reservations(char *real_mode_data) 
	if (!boot_params.hdr.version)

	if (!boot_params.hdr.version)

		copy_bootdata(__va(real_mode_data));

		copy_bootdata(__va(real_mode_data));





	memblock_reserve(__pa_symbol(&_text),

			 __pa_symbol(&__bss_stop) - __pa_symbol(&_text));



	reserve_ebda_region();

	reserve_ebda_region();





	/*

	 * At this point everything still needed from the boot loader

	 * or BIOS or kernel text should be early reserved or marked not

	 * RAM in e820. All other memory is free game.

	 */



	start_kernel();

	start_kernel();

}
 
}

arch/x86/kernel/setup.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -805,8 +805,17 @@ early_param("reservelow", parse_reservelow); 




void __init setup_arch(char **cmdline_p)

void __init setup_arch(char **cmdline_p)

{

{

	memblock_reserve(__pa_symbol(_text),

			 (unsigned long)__bss_stop - (unsigned long)_text);



	early_reserve_initrd();

	early_reserve_initrd();





	/*

	 * At this point everything still needed from the boot loader

	 * or BIOS or kernel text should be early reserved or marked not

	 * RAM in e820. All other memory is free game.

	 */



#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));

	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));

	visws_early_detect();

	visws_early_detect();