* Re: linux-next: Tree for July 16 (acpi/apei)
[not found] <20110717000815.c83755be9598d34ac8431908@canb.auug.org.au>
@ 2011-07-16 19:03 ` Randy Dunlap
2011-07-16 22:16 ` [PATCH] ACPI: APEI build fix Len Brown
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2011-07-16 19:03 UTC (permalink / raw)
To: Stephen Rothwell, linux-acpi; +Cc: linux-next, LKML
On Sun, 17 Jul 2011 00:08:15 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20110707:
When # CONFIG_ACPI_APEI_GHES is not set:
(.init.text+0x4c22): undefined reference to `ghes_disable'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ACPI: APEI build fix
2011-07-16 19:03 ` linux-next: Tree for July 16 (acpi/apei) Randy Dunlap
@ 2011-07-16 22:16 ` Len Brown
2011-07-16 23:45 ` Randy Dunlap
0 siblings, 1 reply; 3+ messages in thread
From: Len Brown @ 2011-07-16 22:16 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-acpi, linux-next, LKML
From: Len Brown <len.brown@intel.com>
as GHES is optional...
When # CONFIG_ACPI_APEI_GHES is not set:
(.init.text+0x4c22): undefined reference to `ghes_disable'
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/bus.c | 2 --
include/acpi/apei.h | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 43ce3b0..437ddbf 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -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))) {
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index d40bc55..51a527d 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -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);
--
1.7.6.178.g55272
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ACPI: APEI build fix
2011-07-16 22:16 ` [PATCH] ACPI: APEI build fix Len Brown
@ 2011-07-16 23:45 ` Randy Dunlap
0 siblings, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2011-07-16 23:45 UTC (permalink / raw)
To: Len Brown; +Cc: Stephen Rothwell, linux-acpi, linux-next, LKML
On Sat, 16 Jul 2011 18:16:20 -0400 (EDT) Len Brown wrote:
> From: Len Brown <len.brown@intel.com>
>
> as GHES is optional...
>
> When # CONFIG_ACPI_APEI_GHES is not set:
>
> (.init.text+0x4c22): undefined reference to `ghes_disable'
>
> Signed-off-by: Len Brown <len.brown@intel.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks.
> ---
> drivers/acpi/bus.c | 2 --
> include/acpi/apei.h | 4 ++++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index 43ce3b0..437ddbf 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -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))) {
> diff --git a/include/acpi/apei.h b/include/acpi/apei.h
> index d40bc55..51a527d 100644
> --- a/include/acpi/apei.h
> +++ b/include/acpi/apei.h
> @@ -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);
> --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-16 23:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20110717000815.c83755be9598d34ac8431908@canb.auug.org.au>
2011-07-16 19:03 ` linux-next: Tree for July 16 (acpi/apei) Randy Dunlap
2011-07-16 22:16 ` [PATCH] ACPI: APEI build fix Len Brown
2011-07-16 23:45 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox