[BUGFIX] ACPI, APEI, Fix building of APEI EINJ and GHES

[Huang Ying]

Randy reported building warnings and errors for APEI EINJ and GHES as follow:

drivers/acpi/apei/einj.c:127:error: implicit declaration of function 'ndelay'

ghes.c:(.text+0x119e71): undefined reference to `apei_mce_report_mem_error'
CONFIG_X86_MCE is not enabled

This patch fixes these two bugs.

Reported-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Huang Ying <ying.huang@xxxxxxxxx>
---
 drivers/acpi/apei/einj.c |    1 +
 drivers/acpi/apei/ghes.c |    2 ++
 2 files changed, 3 insertions(+)

--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -29,6 +29,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/debugfs.h>
+#include <linux/delay.h>
 #include <linux/seq_file.h>
 #include <linux/nmi.h>
 #include <acpi/acpi.h>
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -242,6 +242,7 @@ static void ghes_do_proc(struct ghes *gh
 
 	ser = ghes_severity(ghes->estatus->error_severity);
 	apei_estatus_for_each_section(ghes->estatus, gdata) {
+#ifdef CONFIG_X86_MCE
 		if (!uuid_le_cmp(*(uuid_le *)gdata->section_type,
 				 CPER_SEC_PLATFORM_MEM)) {
 			apei_mce_report_mem_error(
@@ -249,6 +250,7 @@ static void ghes_do_proc(struct ghes *gh
 				(struct cper_sec_mem_err *)(gdata+1));
 			processed = 1;
 		}
+#endif
 	}
 
 	if (!processed && printk_ratelimit())


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/