Commit 6998a880 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade() 



Commit 1a1c130a ("ACPI: tables: x86: Reserve memory occupied by
ACPI tables") attempted to address an issue with reserving the memory
occupied by ACPI tables, but it broke the initrd-based table override
mechanism relied on by multiple users.

To restore the initrd-based ACPI table override functionality, move
the acpi_boot_table_init() invocation in setup_arch() on x86 after
the acpi_table_upgrade() one.

Fixes: 1a1c130a ("ACPI: tables: x86: Reserve memory occupied by ACPI tables")
Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d434405a

arch/x86/kernel/setup.c

+2 −3
Original line number Diff line number Diff line
@@ -1045,9 +1045,6 @@ void __init setup_arch(char **cmdline_p) 


	cleanup_highmap();



	/* Look for ACPI tables and reserve memory occupied by them. */

	acpi_boot_table_init();



	memblock_set_current_limit(ISA_END_ADDRESS);

	e820__memblock_setup();
@@ -1132,6 +1129,8 @@ void __init setup_arch(char **cmdline_p) 
	reserve_initrd();



	acpi_table_upgrade();

	/* Look for ACPI tables and reserve memory occupied by them. */

	acpi_boot_table_init();



	vsmp_init();