Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7e09d45 authored Jul 16, 2011 by 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: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Len Brown <len.brown@intel.com>

parent ba61ca4a

drivers/acpi/bus.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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))) {

include/acpi/apei.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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);