Since HEST (hardware error sources table) can describe more than PCI specific errors, it needs to be moved out of acpi_pci_root_init.
Signed-off-by: Tomasz Nowicki tomasz.nowicki@linaro.org --- drivers/acpi/pci_root.c | 2 -- drivers/acpi/scan.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index e427dc5..8e88431 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -574,8 +574,6 @@ static void acpi_pci_root_remove(struct acpi_device *device)
void __init acpi_pci_root_init(void) { - acpi_hest_init(); - if (!acpi_pci_disabled) { pci_acpi_crs_quirks(); acpi_scan_add_handler(&pci_root_handler); diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index da13061..f732f1d 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -13,6 +13,7 @@ #include <linux/nls.h>
#include <acpi/acpi_drivers.h> +#include <acpi/apei.h>
#include "internal.h"
@@ -2036,6 +2037,7 @@ int __init acpi_scan_init(void) printk(KERN_ERR PREFIX "Could not register bus type\n"); }
+ acpi_hest_init(); #if defined(CONFIG_PCI) acpi_pci_root_init(); acpi_pci_link_init();