diff options
| author | Tomasz Nowicki <tomasz.nowicki@linaro.org> | 2013-06-19 10:27:51 +0200 |
|---|---|---|
| committer | Tomasz Nowicki <tomasz.nowicki@linaro.org> | 2013-06-19 10:27:51 +0200 |
| commit | ae1b59e20a7ba207103d20573e443aff139f6315 (patch) | |
| tree | 9df29a7de03b4abd4a6af2b89d484f4f6fe7c513 | |
| parent | d87d7d93d1f4ca1153b45ee29bfa51e484230679 (diff) | |
acpi, apei, hest: Move HEST table initialization where it belongs.
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>
| -rw-r--r-- | drivers/acpi/pci_root.c | 2 | ||||
| -rw-r--r-- | 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 e427dc516c76..8e8843135a87 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 da13061d2b6e..f732f1de5c4e 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(); |