https://github.com/torvalds/linux
Revision d3072e6a7e9bf7aca200370317f8e297be360b17 authored by Rafael J. Wysocki on 16 January 2011, 19:44:22 UTC, committed by Linus Torvalds on 16 January 2011, 19:56:26 UTC
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>
1 parent fc8fe1e
History
Tip revision: d3072e6a7e9bf7aca200370317f8e297be360b17 authored by Rafael J. Wysocki on 16 January 2011, 19:44:22 UTC
ACPI: Fix boot problem related to APEI with acpi_disabled set
Tip revision: d3072e6
File Mode Size
Kconfig -rw-r--r-- 442 bytes
Makefile -rw-r--r-- 326 bytes
netlabel_addrlist.c -rw-r--r-- 10.4 KB
netlabel_addrlist.h -rw-r--r-- 6.3 KB
netlabel_cipso_v4.c -rw-r--r-- 21.3 KB
netlabel_cipso_v4.h -rw-r--r-- 4.8 KB
netlabel_domainhash.c -rw-r--r-- 21.0 KB
netlabel_domainhash.h -rw-r--r-- 3.4 KB
netlabel_kapi.c -rw-r--r-- 28.2 KB
netlabel_mgmt.c -rw-r--r-- 20.1 KB
netlabel_mgmt.h -rw-r--r-- 6.2 KB
netlabel_unlabeled.c -rw-r--r-- 43.3 KB
netlabel_unlabeled.h -rw-r--r-- 7.0 KB
netlabel_user.c -rw-r--r-- 3.1 KB
netlabel_user.h -rw-r--r-- 1.9 KB

back to top