diff options
| author | Len Brown <len.brown@intel.com> | 2011-07-17 00:14:21 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-08-03 17:15:59 +0200 |
| commit | a7e09d450b2e0b068e850d103b6ee1af537d1910 (patch) | |
| tree | b38756299aeb751ea88a143560ceae0241471dc6 | |
| parent | ACPI, APEI, GHES: Add hardware memory error recovery support (diff) | |
| download | linux-a7e09d450b2e0b068e850d103b6ee1af537d1910.tar.xz linux-a7e09d450b2e0b068e850d103b6ee1af537d1910.zip | |
ACPI: APEI build fix
as GHES is optional...
When # CONFIG_ACPI_APEI_GHES is not set:
(.init.text+0x4c22): undefined reference to `ghes_disable'
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/bus.c | 2 | ||||
| -rw-r--r-- | include/acpi/apei.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 43ce3b0c4921..437ddbf0c49a 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -544,10 +544,8 @@ static void acpi_bus_osc_support(void) capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT; #endif -#ifdef CONFIG_ACPI_APEI_GHES if (!ghes_disable) capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT; -#endif if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))) return; if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) { diff --git a/include/acpi/apei.h b/include/acpi/apei.h index d40bc5521fcb..51a527d24a8a 100644 --- a/include/acpi/apei.h +++ b/include/acpi/apei.h @@ -18,7 +18,11 @@ extern int hest_disable; extern int erst_disable; +#ifdef CONFIG_ACPI_APEI_GHES extern int ghes_disable; +#else +#define ghes_disable 1 +#endif #ifdef CONFIG_ACPI_APEI void __init acpi_hest_init(void); |