x86: unify hwirq.h

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 cdb09d77af031a2d21c49d036607b701abdfe13e..1db2dff1ef490bc96b4bc0e941b39b9316b11927 100644 (file)
--- 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
deleted file mode 100644 (file)
index 89fca5a..0000000
--- a/include/asm-x86/hw_irq_32.h
+++ /dev/null
@@ -1,5 +0,0 @@
-
-extern void (*const interrupt[NR_IRQS])(void);
-
-
-

diff --git a/include/asm-x86/hw_irq_64.h b/include/asm-x86/hw_irq_64.h
deleted file mode 100644 (file)
index 428785b..0000000
--- a/include/asm-x86/hw_irq_64.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __ASSEMBLY__
-
-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;
-
-/*
- * Various low-level irq details needed by irq.c, process.c,
- * time.c, io_apic.c and smp.c
- *
- * Interrupt entry/exit code at both C and assembly level
- */
-
-#include <asm/ptrace.h>
-
-#endif