From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753363AbbBSA1p (ORCPT ); Wed, 18 Feb 2015 19:27:45 -0500 Received: from terminus.zytor.com ([198.137.202.10]:47627 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752567AbbBSA1n (ORCPT ); Wed, 18 Feb 2015 19:27:43 -0500 Date: Wed, 18 Feb 2015 16:27:25 -0800 From: tip-bot for Ricardo Ribalda Delgado Message-ID: Cc: JBeulich@suse.com, ricardo.ribalda@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, rientjes@google.com, hpa@zytor.com, macro@linux-mips.org Reply-To: tglx@linutronix.de, mingo@kernel.org, rientjes@google.com, linux-kernel@vger.kernel.org, JBeulich@suse.com, ricardo.ribalda@gmail.com, macro@linux-mips.org, hpa@zytor.com In-Reply-To: <1422905231-16067-1-git-send-email-ricardo.ribalda@gmail.com> References: <1422905231-16067-1-git-send-email-ricardo.ribalda@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/apic: Fix the devicetree build in certain configs Git-Commit-ID: b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8 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 Commit-ID: b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8 Gitweb: http://git.kernel.org/tip/b273c2c2f2d2d13dc0bfa8923d52fbaf8fa56ae8 Author: Ricardo Ribalda Delgado AuthorDate: Mon, 2 Feb 2015 20:27:11 +0100 Committer: Ingo Molnar CommitDate: Wed, 18 Feb 2015 22:30:19 +0100 x86/apic: Fix the devicetree build in certain configs Without this patch: LD init/built-in.o arch/x86/built-in.o: In function `dtb_lapic_setup': kernel/devicetree.c:155: undefined reference to `apic_force_enable' Makefile:923: recipe for target 'vmlinux' failed make: *** [vmlinux] Error 1 Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Maciej W. Rozycki Cc: David Rientjes Cc: Jan Beulich Link: http://lkml.kernel.org/r/1422905231-16067-1-git-send-email-ricardo.ribalda@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/apic.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 92003f3..efc3b22 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -213,7 +213,15 @@ void register_lapic_address(unsigned long address); extern void setup_boot_APIC_clock(void); extern void setup_secondary_APIC_clock(void); extern int APIC_init_uniprocessor(void); + +#ifdef CONFIG_X86_64 +static inline int apic_force_enable(unsigned long addr) +{ + return -1; +} +#else extern int apic_force_enable(unsigned long addr); +#endif extern int apic_bsp_setup(bool upmode); extern void apic_ap_setup(void);