From: Rafael J. Wysocki Date: Sun, 16 Jan 2011 19:44:22 +0000 (+0100) Subject: ACPI: Fix boot problem related to APEI with acpi_disabled set X-Git-Tag: v2.6.38-rc1~33 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3072e6a7e9bf7aca200370317f8e297be360b17;p=pandora-kernel.git 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 Signed-off-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed