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

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

x86, boot: Not need to check setup_header version for setup_data 



That is for bootloaders.

setup_data is in setup_header, and bootloader is copying that from bzImage.
So for old bootloader should keep that as 0 already.

old kexec-tools till now for elf image set setup_data to 0, so it is ok.

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


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 8ee2f2df

arch/x86/kernel/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -439,8 +439,6 @@ static void __init parse_setup_data(void) 
	struct setup_data *data;

	u64 pa_data;



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		u32 data_len, map_len;
@@ -476,8 +474,6 @@ static void __init e820_reserve_setup_data(void) 
	u64 pa_data;

	int found = 0;



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_memremap(pa_data, sizeof(*data));
@@ -501,8 +497,6 @@ static void __init memblock_x86_reserve_range_setup_data(void) 
	struct setup_data *data;

	u64 pa_data;



	if (boot_params.hdr.version < 0x0209)

		return;

	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_memremap(pa_data, sizeof(*data));