diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:22:31 -0700 |
|---|---|---|
| committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:22:31 -0700 |
| commit | d228c72ae7e3ce5b50045505ddcfd36181391b32 (patch) | |
| tree | 5a8d5e531eeca337488ad1c2d972732c0d13a0ca | |
| parent | 042e24586030355e4d0118453cafba61eefac441 (diff) | |
| download | linux-yinghai-d228c72ae7e3ce5b50045505ddcfd36181391b32.tar.gz | |
x86: move declaration for mp_register_ioapic()
mptable could use that too...
Reported-by: Fengguang Wu <wfg@linux.intel.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
| -rw-r--r-- | arch/x86/include/asm/mpspec.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index e70b7e5a6a82c2..13439c57bbe418 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); |