Skip to contentSkip to conversation

ACPI, APEI, Fix building of APEI EINJ and GHES

BUGFIX Huang Ying 3 participants 3 messages May 10, 2010

Subsystems (2)
lore
Share & tools
lore

Huang Ying

author
#0 lore raw

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.

---
 drivers/acpi/apei/einj.c |    1 +
 drivers/acpi/apei/ghes.c |    2 ++
 2 files changed, 3 insertions(+)
drivers/acpi/apei/einj.c +1 -0
@@ -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>
drivers/acpi/apei/ghes.c +2 -0
@@ -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())
#1 lore raw
Quoted 7 lines · 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

Quoted 8 lines

This patch fixes these two bugs.

---
 drivers/acpi/apei/einj.c |    1 +
 drivers/acpi/apei/ghes.c |    2 ++
 2 files changed, 3 insertions(+)

The drivers/acpi/apei directory isn't in Linus' tree yet, so this should be fixed by reposting the original submission with this change included. Otherwise, there will be a series of commits that is not bisectable because of this build failure.

Quoted 36 lines
drivers/acpi/apei/einj.c +1 -0
@@ -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>
drivers/acpi/apei/ghes.c +2 -1
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw
In reply to Huang Ying
Quoted 11 lines · 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.

Yes, fixed. Thanks.

Quoted 35 lines
---
 drivers/acpi/apei/einj.c |    1 +
 drivers/acpi/apei/ghes.c |    2 ++
 2 files changed, 3 insertions(+)
drivers/acpi/apei/einj.c +1 -0
@@ -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>
drivers/acpi/apei/ghes.c +2 -0
@@ -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())
Signature · 2 lines
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***