linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [BUGFIX] ACPI, APEI, Fix building of APEI EINJ and GHES
@ 2010-05-10  9:24 Huang Ying
  2010-05-10 16:50 ` Bjorn Helgaas
  2010-05-10 17:00 ` Randy Dunlap
  0 siblings, 2 replies; 3+ messages in thread
From: Huang Ying @ 2010-05-10  9:24 UTC (permalink / raw)
  To: Len Brown, Randy Dunlap
  Cc: Stephen Rothwell, LKML, linux-acpi@vger.kernel.org

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@oracle.com>
Signed-off-by: Huang Ying <ying.huang@intel.com>
---
 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())



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [BUGFIX] ACPI, APEI, Fix building of APEI EINJ and GHES
  2010-05-10  9:24 [BUGFIX] ACPI, APEI, Fix building of APEI EINJ and GHES Huang Ying
@ 2010-05-10 16:50 ` Bjorn Helgaas
  2010-05-10 17:00 ` Randy Dunlap
  1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2010-05-10 16:50 UTC (permalink / raw)
  To: Huang Ying
  Cc: Len Brown, Randy Dunlap, Stephen Rothwell, LKML,
	linux-acpi@vger.kernel.org

On Monday, May 10, 2010 03:24:42 am Huang Ying wrote:
> 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@oracle.com>
> Signed-off-by: Huang Ying <ying.huang@intel.com>
> ---
>  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.

> --- 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@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [BUGFIX] ACPI, APEI, Fix building of APEI EINJ and GHES
  2010-05-10  9:24 [BUGFIX] ACPI, APEI, Fix building of APEI EINJ and GHES Huang Ying
  2010-05-10 16:50 ` Bjorn Helgaas
@ 2010-05-10 17:00 ` Randy Dunlap
  1 sibling, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2010-05-10 17:00 UTC (permalink / raw)
  To: Huang Ying; +Cc: Len Brown, Stephen Rothwell, LKML, linux-acpi@vger.kernel.org

On 05/10/10 02:24, Huang Ying wrote:
> 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@oracle.com>
> Signed-off-by: Huang Ying <ying.huang@intel.com>

Yes, fixed.  Thanks.

> ---
>  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())
> 
> 


-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-05-10 17:02 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-10  9:24 [BUGFIX] ACPI, APEI, Fix building of APEI EINJ and GHES Huang Ying
2010-05-10 16:50 ` Bjorn Helgaas
2010-05-10 17:00 ` Randy Dunlap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).