Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758553AbbEEMER (ORCPT ); Tue, 5 May 2015 08:04:17 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51694 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758417AbbEEMEF (ORCPT ); Tue, 5 May 2015 08:04:05 -0400 Date: Tue, 5 May 2015 05:03:41 -0700 From: tip-bot for Jan Kiszka Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, jan.kiszka@siemens.com, mingo@kernel.org, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, jan.kiszka@siemens.com In-Reply-To: <55479708.2000104@siemens.com> References: <55479708.2000104@siemens.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/x2apic: Acpi_gbl_FADT existence depends on CONFIG_ACPI Git-Commit-ID: 781674fc33adf0d975a361e111bb45804356aa23 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1502 Lines: 42 Commit-ID: 781674fc33adf0d975a361e111bb45804356aa23 Gitweb: http://git.kernel.org/tip/781674fc33adf0d975a361e111bb45804356aa23 Author: Jan Kiszka AuthorDate: Mon, 4 May 2015 17:58:00 +0200 Committer: Thomas Gleixner CommitDate: Tue, 5 May 2015 14:01:37 +0200 x86/x2apic: Acpi_gbl_FADT existence depends on CONFIG_ACPI If ACPI is disabled, acpi_gbl_FADT is not available, and and the build breaks. Signed-off-by: Jan Kiszka Link: http://lkml.kernel.org/r/55479708.2000104@siemens.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/apic/x2apic_phys.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c index 6fae733..3ffd925 100644 --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c @@ -21,11 +21,13 @@ early_param("x2apic_phys", set_x2apic_phys_mode); static bool x2apic_fadt_phys(void) { +#ifdef CONFIG_ACPI if ((acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) && (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL)) { printk(KERN_DEBUG "System requires x2apic physical mode\n"); return true; } +#endif return false; } -- 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/