diff options
| author | Ingo Molnar | 2015-06-30 07:57:04 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-06-30 07:57:04 +0200 |
| commit | dc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b (patch) | |
| tree | cd2febb026bab11526f38b266a64f5086330d793 /arch/x86 | |
| parent | x86/fpu: Fix FPU related boot regression when CPUID masking BIOS feature is e... (diff) | |
| parent | x86/boot/setup: Clean up the e820_reserve_setup_data() code (diff) | |
| download | kernel-qcow2-linux-dc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b.tar.gz kernel-qcow2-linux-dc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b.tar.xz kernel-qcow2-linux-dc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b.zip | |
Merge branch 'x86/boot' into x86/urgent
Merge branch that got ready.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/setup.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 265a6fdea8b7..4883c0a990a5 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -461,19 +461,18 @@ static void __init e820_reserve_setup_data(void) { struct setup_data *data; u64 pa_data; - int found = 0; pa_data = boot_params.hdr.setup_data; + if (!pa_data) + return; + while (pa_data) { data = early_memremap(pa_data, sizeof(*data)); e820_update_range(pa_data, sizeof(*data)+data->len, E820_RAM, E820_RESERVED_KERN); - found = 1; pa_data = data->next; early_memunmap(data, sizeof(*data)); } - if (!found) - return; sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); memcpy(&e820_saved, &e820, sizeof(struct e820map)); |