Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH v5 24/33] x86: Move declaration for mp_register_ioapic() | Date | Thu, 2 Jan 2014 16:05:56 -0800 |
| |
Address compiling problem that Fengguang report.
Reported-by: Fengguang Wu <wfg@linux.intel.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Jiang Liu <jiang.liu@huawei.com> --- arch/x86/include/asm/mpspec.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index b98665f..e9d850e 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h @@ -95,10 +95,26 @@ static inline void early_reserve_e820_mpc_new(void) { } #endif int 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.4
| |