From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Yinghai Lu To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Tony Luck , Bjorn Helgaas , "Rafael J. Wysocki" Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu Subject: [PATCH v4 24/28] x86: Move declaration for mp_register_ioapic() Date: Sat, 10 Aug 2013 19:48:10 -0700 Message-Id: <1376189294-32022-25-git-send-email-yinghai@kernel.org> In-Reply-To: <1376189294-32022-1-git-send-email-yinghai@kernel.org> References: <1376189294-32022-1-git-send-email-yinghai@kernel.org> Sender: linux-acpi-owner@vger.kernel.org List-ID: 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 49f6ecc..a57f113 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 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.8.1.4