ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 13 Apr 2021 14:01:00 +0000 (16:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 21 Apr 2021 11:00:51 +0000 (13:00 +0200)
commitf338b8fffd7532f92af0eb8e1366867f8ba2a574
tree43913ed07dd2ea9c4ba4b38ccc7dc76cb231905d
parente5eb9757fe4c2392e069246ae78badc573af1833
ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()

[ Upstream commit 6998a8800d73116187aad542391ce3b2dd0f9e30 ]

Commit 1a1c130ab757 ("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: 1a1c130ab757 ("ACPI: tables: x86: Reserve memory occupied by ACPI tables")
Reported-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kernel/setup.c