]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
ACPI: Fix boot problem related to APEI with acpi_disabled set
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 16 Jan 2011 19:44:22 +0000 (20:44 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Jan 2011 19:56:26 +0000 (11:56 -0800)
commitd3072e6a7e9bf7aca200370317f8e297be360b17
treeaaeae900e1942aef892276b4ddb5c85e4882745a
parentfc8fe1e992ae0326a88edbe4d6793e840bbdd4ff
ACPI: Fix boot problem related to APEI with acpi_disabled set

Commit 415e12b23792 ("PCI/ACPI: Request _OSC control once for each root
bridge (v3)") put the acpi_hest_init() call in acpi_pci_root_init() into
a wrong place, presumably because the author confused acpi_pci_disabled
with acpi_disabled.  Bring the code ordering in acpi_pci_root_init()
back to sanity.

Additionally, make sure that hest_disable is set when acpi_disabled is
set, which is going to prevent acpi_hest_parse(), that still may be
executed for acpi_disabled=1 through aer_acpi_firmware_first(), from
crashing because of uninitialized hest_tab.

Reported-and-tested-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/acpi/apei/hest.c
drivers/acpi/pci_root.c