x86: unify hwirq.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
git-mirror · May 12, 2008 · 22dc12d · 22dc12d
1 parent 97e7b6f
commit 22dc12d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 26 deletions.
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h
@@ -89,12 +89,15 @@ extern asmlinkage void qic_reschedule_interrupt(void);
 extern asmlinkage void qic_enable_irq_interrupt(void);
 extern asmlinkage void qic_call_function_interrupt(void);
 
-#endif /* !ASSEMBLY_ */
-
 #ifdef CONFIG_X86_32
-# include "hw_irq_32.h"
+extern void (*const interrupt[NR_IRQS])(void);
 #else
-# include "hw_irq_64.h"
+typedef int vector_irq_t[NR_VECTORS];
+DECLARE_PER_CPU(vector_irq_t, vector_irq);
+extern void __setup_vector_irq(int cpu);
+extern spinlock_t vector_lock;
 #endif
 
+#endif /* !ASSEMBLY_ */
+
 #endif
diff --git a/include/asm-x86/hw_irq_32.h b/include/asm-x86/hw_irq_32.h
diff --git a/include/asm-x86/hw_irq_64.h b/include/asm-x86/hw_irq_64.h