From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760412Ab3BHT3E (ORCPT ); Fri, 8 Feb 2013 14:29:04 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:26073 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760352Ab3BHT3A (ORCPT ); Fri, 8 Feb 2013 14:29:00 -0500 From: Yinghai Lu To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Bjorn Helgaas , "Rafael J. Wysocki" Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v2 24/26] x86: Move declaration for mp_register_ioapic() Date: Fri, 8 Feb 2013 11:28:21 -0800 Message-Id: <1360351703-20571-25-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360351703-20571-1-git-send-email-yinghai@kernel.org> References: <1360351703-20571-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Address compiling problem that Fengguang report. Reported-by: Fengguang Wu Signed-off-by: Yinghai Lu --- arch/x86/include/asm/mpspec.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index e70b7e5..13439c5 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -95,10 +95,27 @@ static inline void early_reserve_e820_mpc_new(void) { } #endif void __cpuinit generic_processor_info(int apicid, int version); -#ifdef CONFIG_ACPI + +#ifdef CONFIG_X86_IO_APIC int __mp_register_ioapic(int id, u32 address, u32 gsi_base, bool hot); int mp_unregister_ioapic(u32 gsi_base); extern void mp_register_ioapic(int id, u32 address, u32 gsi_base); +#else +static inline int __mp_register_ioapic(int id, u32 address, u32 gsi_base, + bool hot) +{ + return 0; +} +static inline int mp_unregister_ioapic(u32 gsi_base) +{ + return 0; +} +static inline void mp_register_ioapic(int id, u32 address, u32 gsi_base) +{ +} +#endif + +#ifdef CONFIG_ACPI extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi); extern void mp_config_acpi_legacy_irqs(void); -- 1.7.10.4