From: Len Brown <lenb@kernel.org>
To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
Cc: Len Brown <len.brown@intel.com>
Subject: [PATCH 17/19] ACPI: APEI build fix
Date: Tue, 02 Aug 2011 18:14:50 -0400 [thread overview]
Message-ID: <785d8abb8ac20eeb48db31e5d41b06a1ea3714ca.1312323131.git.len.brown@intel.com> (raw)
In-Reply-To: <1312323292-2986-1-git-send-email-lenb@kernel.org>
In-Reply-To: <ca7cc5110a313a609da40ae948978a585352564b.1312323131.git.len.brown@intel.com>
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'
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
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.396.ge0613
next prev parent reply other threads:[~2011-08-02 22:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-02 22:14 APEI patches for Linux 3.1 Len Brown
2011-08-02 22:14 ` [PATCH 01/19] ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled Len Brown
2011-08-02 22:14 ` [PATCH 02/19] ACPI, APEI, ERST, Fix erst-dbg long record reading issue Len Brown
2011-08-02 22:14 ` [PATCH 03/19] ACPI, APEI, GHES, Do not ratelimit fatal error printk before panic Len Brown
2011-08-02 22:14 ` [PATCH 04/19] ACPI, APEI, Add apei_exec_run_optional Len Brown
2011-08-02 22:14 ` [PATCH 05/19] ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST Len Brown
2011-08-02 22:14 ` [PATCH 06/19] ACPI, APEI, GHES, Prevent GHES to be built as module Len Brown
2011-08-02 22:14 ` [PATCH 07/19] ACPI, APEI, GHES, Support disable GHES at boot time Len Brown
2011-08-02 22:14 ` [PATCH 08/19] ACPI, APEI, Add APEI bit support in generic _OSC call Len Brown
2011-08-02 22:14 ` [PATCH 09/19] ACPI, APEI, Add WHEA _OSC support Len Brown
2011-08-02 22:14 ` [PATCH 10/19] Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG Len Brown
2011-08-03 9:04 ` Ralf Baechle
2011-08-03 15:00 ` Richard Henderson
2011-08-02 22:14 ` [PATCH 11/19] lib, Add lock-less NULL terminated single list Len Brown
2011-08-02 22:14 ` [PATCH 12/19] lib, Make gen_pool memory allocator lockless Len Brown
2011-08-02 22:14 ` [PATCH 13/19] ACPI, APEI, GHES, printk support for recoverable error via NMI Len Brown
2011-08-02 22:14 ` [PATCH 14/19] ACPI, APEI, GHES, Error records content based throttle Len Brown
2011-08-02 22:14 ` [PATCH 15/19] HWPoison: add memory_failure_queue() Len Brown
2011-08-02 22:14 ` [PATCH 16/19] ACPI, APEI, GHES: Add hardware memory error recovery support Len Brown
2011-08-02 22:14 ` Len Brown [this message]
2011-08-02 22:14 ` [PATCH 18/19] APEI GHES: 32-bit buildfix Len Brown
2011-08-02 22:14 ` [PATCH 19/19] ACPI, APEI, EINJ Param support is disabled by default Len Brown
2011-08-03 8:44 ` [PATCH 10/19] Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG David Howells
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=785d8abb8ac20eeb48db31e5d41b06a1ea3714ca.1312323131.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
Powered by JetHome