Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a7e09d450b2e0b068e850d103b6ee1af537d1910

Authored by Len Brown
1 parent ba61ca4aab
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -544,10 +544,8 @@
544 544 capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT;
545 545 #endif
546 546  
547   -#ifdef CONFIG_ACPI_APEI_GHES
548 547 if (!ghes_disable)
549 548 capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT;
550   -#endif
551 549 if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
552 550 return;
553 551 if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) {
... ... @@ -18,7 +18,11 @@
18 18  
19 19 extern int hest_disable;
20 20 extern int erst_disable;
  21 +#ifdef CONFIG_ACPI_APEI_GHES
21 22 extern int ghes_disable;
  23 +#else
  24 +#define ghes_disable 1
  25 +#endif
22 26  
23 27 #ifdef CONFIG_ACPI_APEI
24 28 void __init acpi_hest_init(void);