diff options
| author |   Huang Ying <ying.huang@intel.com> | 2011-07-13 13:14:19 +0800 |
|---|---|---|
| committer |   Len Brown <len.brown@intel.com> | 2011-07-13 23:36:34 -0400 |
| commit | b6a9501658530d8b8374e37f1edb549039a8a260 (patch) | |
| tree | e41103e3cd5a389d679b208eb254430f5100db68 /drivers/acpi/apei/hest.c | |
| parent | ACPI, APEI, GHES, Prevent GHES to be built as module (diff) | |
| download | linux-dev-b6a9501658530d8b8374e37f1edb549039a8a260.tar.xz linux-dev-b6a9501658530d8b8374e37f1edb549039a8a260.zip | |
ACPI, APEI, GHES, Support disable GHES at boot time
Some machine may have broken firmware so that GHES and firmware first
mode should be disabled. This patch adds support to that.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Reviewed-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/apei/hest.c')
| -rw-r--r-- | drivers/acpi/apei/hest.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 181bc2f7bb74..05fee06f4d6e 100644 --- a/drivers/acpi/apei/hest.c +++ b/drivers/acpi/apei/hest.c @@ -231,16 +231,17 @@ void __init acpi_hest_init(void) goto err; } - rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count); - if (rc) - goto err; - - rc = hest_ghes_dev_register(ghes_count); - if (!rc) { - pr_info(HEST_PFX "Table parsing has been initialized.\n"); - return; + if (!ghes_disable) { + rc = apei_hest_parse(hest_parse_ghes_count, &ghes_count); + if (rc) + goto err; + rc = hest_ghes_dev_register(ghes_count); + if (rc) + goto err; } + pr_info(HEST_PFX "Table parsing has been initialized.\n"); + return; err: hest_disable = 1; } |