aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-01-24 15:20:08 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2013-01-29 22:32:57 -0500
commitd1af6d045fba6b070fa81f54dfe9227214be99ea (patch)
tree47f4176e5475726702b7ea9cf87fca1f38211bbf /arch
parent8ee2f2dfdbdfe1851fcc0191b2d4faa4c26a39fb (diff)
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: Yinghai Lu <yinghai@kernel.org> Link: http://lkml.kernel.org/r/1359058816-7615-28-git-send-email-yinghai@kernel.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/setup.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 519f2bc4950a..b80bee10982f 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -439,8 +439,6 @@ static void __init parse_setup_data(void)
439 struct setup_data *data; 439 struct setup_data *data;
440 u64 pa_data; 440 u64 pa_data;
441 441
442 if (boot_params.hdr.version < 0x0209)
443 return;
444 pa_data = boot_params.hdr.setup_data; 442 pa_data = boot_params.hdr.setup_data;
445 while (pa_data) { 443 while (pa_data) {
446 u32 data_len, map_len; 444 u32 data_len, map_len;
@@ -476,8 +474,6 @@ static void __init e820_reserve_setup_data(void)
476 u64 pa_data; 474 u64 pa_data;
477 int found = 0; 475 int found = 0;
478 476
479 if (boot_params.hdr.version < 0x0209)
480 return;
481 pa_data = boot_params.hdr.setup_data; 477 pa_data = boot_params.hdr.setup_data;
482 while (pa_data) { 478 while (pa_data) {
483 data = early_memremap(pa_data, sizeof(*data)); 479 data = early_memremap(pa_data, sizeof(*data));
@@ -501,8 +497,6 @@ static void __init memblock_x86_reserve_range_setup_data(void)
501 struct setup_data *data; 497 struct setup_data *data;
502 u64 pa_data; 498 u64 pa_data;
503 499
504 if (boot_params.hdr.version < 0x0209)
505 return;
506 pa_data = boot_params.hdr.setup_data; 500 pa_data = boot_params.hdr.setup_data;
507 while (pa_data) { 501 while (pa_data) {
508 data = early_memremap(pa_data, sizeof(*data)); 502 data = early_memremap(pa_data, sizeof(*data));