OSDN Git Service

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)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 13 Apr 2021 14:03:01 +0000 (16:03 +0200)
commit6998a8800d73116187aad542391ce3b2dd0f9e30
tree8a2962d02fe980b623d68fc8096e75d54add734d
parentd434405aaab7d0ebc516b68a8fc4100922d7f5ef
ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()

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>
arch/x86/kernel/setup.c