Commit dc5fb575 authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'x86/boot' into x86/urgent

Merge branch that got ready.
Signed-off-by: default avatarIngo Molnar <>
parents db52ef74 f2af7d25
......@@ -406,7 +406,7 @@ Protocol: 2.00+
- If 0, the protected-mode code is loaded at 0x10000.
- If 1, the protected-mode code is loaded at 0x100000.
Bit 1 (kernel internal): ALSR_FLAG
Bit 1 (kernel internal): KASLR_FLAG
- Used internally by the compressed kernel to communicate
KASLR status to kernel proper.
If 1, KASLR enabled.
......@@ -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)
while (pa_data) {
data = early_memremap(pa_data, sizeof(*data));
e820_update_range(pa_data, sizeof(*data)+data->len,
found = 1;
pa_data = data->next;
early_memunmap(data, sizeof(*data));
if (!found)
sanitize_e820_map(, ARRAY_SIZE(, &e820.nr_map);
memcpy(&e820_saved, &e820, sizeof(struct e820map));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment