diff options
| author | Tomasz Nowicki <tomasz.nowicki@linaro.org> | 2013-06-19 10:27:51 +0200 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2016-01-22 12:14:39 +0000 |
| commit | 3e841a5becb944727d74464b4a5944b008c2ed16 (patch) | |
| tree | 67396e839be36e6f634e095b4405f6419b8ba2f9 | |
| parent | f4ffb5a37663dc8d5b1545881f562a9a96d919c5 (diff) | |
acpi, apei, hest: Move HEST table initialization where it belongs.topic-apei-20160122.0
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>
Signed-off-by: Fu Wei <fu.wei@linaro.org>
| -rw-r--r-- | drivers/acpi/pci_root.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/scan.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ae3fe4e64203..a35dd237ded9 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -33,7 +33,6 @@ #include <linux/acpi.h> #include <linux/slab.h> #include <linux/dmi.h> -#include <acpi/apei.h> /* for acpi_hest_init() */ #include "internal.h" @@ -865,7 +864,6 @@ out_release_info: void __init acpi_pci_root_init(void) { - acpi_hest_init(); if (acpi_pci_disabled) return; diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 78d5f02a073b..a52e776a9e02 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -13,6 +13,8 @@ #include <linux/nls.h> #include <linux/dma-mapping.h> +#include <acpi/apei.h> /* for acpi_hest_init() */ + #include <asm/pgtable.h> #include "internal.h" @@ -1912,6 +1914,7 @@ int __init acpi_scan_init(void) { int result; + acpi_hest_init(); acpi_pci_root_init(); acpi_pci_link_init(); acpi_processor_init(); |