Commit a7e09d45 authored by Len Brown's avatar Len Brown

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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ba61ca4a
...@@ -544,10 +544,8 @@ static void acpi_bus_osc_support(void) ...@@ -544,10 +544,8 @@ static void acpi_bus_osc_support(void)
capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT; capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT;
#endif #endif
#ifdef CONFIG_ACPI_APEI_GHES
if (!ghes_disable) if (!ghes_disable)
capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT; capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT;
#endif
if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))) if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
return; return;
if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) { if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) {
......
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
extern int hest_disable; extern int hest_disable;
extern int erst_disable; extern int erst_disable;
#ifdef CONFIG_ACPI_APEI_GHES
extern int ghes_disable; extern int ghes_disable;
#else
#define ghes_disable 1
#endif
#ifdef CONFIG_ACPI_APEI #ifdef CONFIG_ACPI_APEI
void __init acpi_hest_init(void); void __init acpi_hest_init(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment