From: Thomas Gleixner Date: Sun, 24 Oct 2010 09:11:22 +0000 (+0200) Subject: x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage X-Git-Tag: v2.6.38-rc1~458^2~13 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7fb2b870d6a3b92f6750ac2b72858fd098dc9e3f;p=karo-tx-linux.git x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage Stupid me forgot to change the function name for the CONFIG_X86_IO_APIC=n case in commit 23f9b2671 (x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()) Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 7e620baebf86..240a0a5e2b31 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h @@ -186,7 +186,7 @@ extern void __init pre_init_apic_IRQ0(void); #define io_apic_assign_pci_irqs 0 #define setup_ioapic_ids_from_mpc x86_init_noop static const int timer_through_8259 = 0; -static inline void ioapic_init_mappings(void) { } +static inline void ioapic_and_gsi_init(void) { } static inline void ioapic_insert_resources(void) { } #define gsi_top (NR_IRQS_LEGACY) static inline int mp_find_ioapic(u32 gsi) { return 0; }