Commit 7e25f40e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "Restore the initrd-based ACPI table override functionality broken by
  one of the recent fixes"

* tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()
parents 33f0d9d9 6998a880

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();