Commit 007b7560 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar

x86/boot: Run reserve_bios_regions() after we initialize the memory map

reserve_bios_regions() is a quirk that reserves memory that we might
otherwise think is available.  There's no need to run it so early,
and running it before we have the memory map initialized with its
non-quirky inputs makes it hard to make reserve_bios_regions() more

Move it right after we populate the memblock state.
Signed-off-by: default avatarAndy Lutomirski <>
Cc: Borislav Petkov <>
Cc: Brian Gerst <>
Cc: Denys Vlasenko <>
Cc: H. Peter Anvin <>
Cc: Josh Poimboeuf <>
Cc: Linus Torvalds <>
Cc: Mario Limonciello <>
Cc: Matt Fleming <>
Cc: Matthew Garrett <>
Cc: Peter Zijlstra <>
Cc: Thomas Gleixner <>
Link: Ingo Molnar's avatarIngo Molnar <>
parent 82ba4fac
......@@ -25,8 +25,6 @@ static void __init i386_default_early_setup(void)
/* Initialize 32bit specific setup functions */
x86_init.resources.reserve_resources = i386_reserve_resources;
x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
asmlinkage __visible void __init i386_start_kernel(void)
......@@ -183,7 +183,6 @@ void __init x86_64_start_reservations(char *real_mode_data)
switch (boot_params.hdr.hardware_subarch) {
......@@ -1101,6 +1101,8 @@ void __init setup_arch(char **cmdline_p)
* The EFI specification says that boot service code won't be called
* after ExitBootServices(). This is, in fact, a lie.
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