x86: unify apic interrupt function declarations

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h
index a8c5e8b..cdb09d7 100644 (file)
--- a/include/asm-x86/hw_irq.h
+++ b/include/asm-x86/hw_irq.h
@@ -67,6 +67,10 @@ extern void print_IO_APIC(void);
 extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn);
 extern void setup_ioapic_dest(void);
 
+#ifdef CONFIG_X86_64
+extern void enable_IO_APIC(void);
+#endif
+
 /* IPI functions */
 extern void send_IPI_self(int vector);
 extern void send_IPI(int dest, int vector);

diff --git a/include/asm-x86/hw_irq_64.h b/include/asm-x86/hw_irq_64.h
index 9305f74..428785b 100644 (file)
--- a/include/asm-x86/hw_irq_64.h
+++ b/include/asm-x86/hw_irq_64.h
@@ -12,9 +12,6 @@ extern spinlock_t vector_lock;
  * Interrupt entry/exit code at both C and assembly level
  */
 
-extern void enable_IO_APIC(void);
-extern void native_init_IRQ(void);
-
 #include <asm/ptrace.h>
 
 #endif

diff --git a/include/asm-x86/irq_64.h b/include/asm-x86/irq_64.h
index 3037ec6..1ef233d 100644 (file)
--- a/include/asm-x86/irq_64.h
+++ b/include/asm-x86/irq_64.h
@@ -27,4 +27,6 @@ extern void fixup_irqs(cpumask_t map);
 
 #define __ARCH_HAS_DO_SOFTIRQ 1
 
+extern void native_init_IRQ(void);
+
 #endif /* _ASM_IRQ_H */