public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Len Brown <lenb@kernel•org>
To: Randy Dunlap <rdunlap@xenotime•net>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
	linux-acpi@vger•kernel.org, linux-next@vger•kernel.org,
	LKML <linux-kernel@vger•kernel.org>
Subject: [PATCH] ACPI: APEI build fix
Date: Sat, 16 Jul 2011 18:16:20 -0400 (EDT)	[thread overview]
Message-ID: <alpine.LFD.2.02.1107161815220.4339@x980> (raw)
In-Reply-To: <20110716120304.83d79985.rdunlap@xenotime.net>

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



  reply	other threads:[~2011-07-16 22:16 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-16 14:08 linux-next: Tree for July 16 Stephen Rothwell
2011-07-16 14:28 ` Stephen Rothwell
2011-07-16 18:57 ` linux-next: Tree for July 16 (kvm) Randy Dunlap
2011-07-18  8:20   ` Avi Kivity
2011-07-16 19:03 ` linux-next: Tree for July 16 (acpi/apei) Randy Dunlap
2011-07-16 22:16   ` Len Brown [this message]
2011-07-16 23:45     ` [PATCH] ACPI: APEI build fix Randy Dunlap
2011-07-16 19:10 ` linux-next: Tree for July 16 (bcma) Randy Dunlap
2011-07-16 19:14 ` linux-next: Tree for July 16 Arnd Bergmann
2011-07-16 19:14 ` linux-next: Tree for July 16 (net/bnx2x) Randy Dunlap
2011-07-16 20:24   ` Dmitry Kravkov
2011-07-16 20:26     ` David Miller
2011-07-16 20:30       ` Dmitry Kravkov
2011-07-16 20:36         ` David Miller
2011-07-16 21:01         ` Randy Dunlap
2011-07-16 19:17 ` linux-next: Tree for July 16 (tpm) Randy Dunlap
2011-07-16 19:25 ` [PATCH -next] watchdog: hpwdt depends on PCI Randy Dunlap
2011-07-18 16:40   ` Mingarelli, Thomas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LFD.2.02.1107161815220.4339@x980 \
    --to=lenb@kernel$(echo .)org \
    --cc=linux-acpi@vger$(echo .)kernel.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=rdunlap@xenotime$(echo .)net \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox