From patchwork Sat Jul 16 22:16:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 982562 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6GMGZdD020496 for ; Sat, 16 Jul 2011 22:16:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752520Ab1GPWQc (ORCPT ); Sat, 16 Jul 2011 18:16:32 -0400 Received: from vms173007pub.verizon.net ([206.46.173.7]:55319 "EHLO vms173007pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751668Ab1GPWQb (ORCPT ); Sat, 16 Jul 2011 18:16:31 -0400 Received: from localhost.localdomain ([unknown] [65.175.195.226]) by vms173007.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0LOG00IJB5VAKXA0@vms173007.mailsrvcs.net>; Sat, 16 Jul 2011 17:16:25 -0500 (CDT) Received: from localhost.localdomain (x980 [127.0.0.1]) by localhost.localdomain (8.14.4/8.14.4) with ESMTP id p6GMGLv8024647; Sat, 16 Jul 2011 18:16:21 -0400 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.4/8.14.4/Submit) with ESMTP id p6GMGKe9024642; Sat, 16 Jul 2011 18:16:21 -0400 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Sat, 16 Jul 2011 18:16:20 -0400 (EDT) From: Len Brown X-X-Sender: lenb@x980 To: Randy Dunlap Cc: Stephen Rothwell , linux-acpi@vger.kernel.org, linux-next@vger.kernel.org, LKML Subject: [PATCH] ACPI: APEI build fix In-reply-to: <20110716120304.83d79985.rdunlap@xenotime.net> Message-id: References: <20110717000815.c83755be9598d34ac8431908@canb.auug.org.au> <20110716120304.83d79985.rdunlap@xenotime.net> User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sat, 16 Jul 2011 22:16:35 +0000 (UTC) From: Len Brown 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 Reported-by: Randy Dunlap Acked-by: Randy Dunlap --- 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);