summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-05-02 21:55:12 +0200
committerIngo Molnar <mingo@elte.hu>2008-05-12 21:28:05 +0200
commit0bc471d93051a19545257909bc2ed2ad3b389b54 (patch)
treecec90d957c3ce84ef12077f7d16a057b264dc848
parent9b7dc567d03d74a1fbae84e88949b6a60d922d82 (diff)
x86: move BUILD_IRQ macro magic to i8259_64.c
i8259_64.c is the only place which uses those macros. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/kernel/i8259_64.c14
-rw-r--r--include/asm-x86/hw_irq_64.h14
2 files changed, 14 insertions, 14 deletions
diff --git a/arch/x86/kernel/i8259_64.c b/arch/x86/kernel/i8259_64.c
index fa57a1568508..c4ae4769ce67 100644
--- a/arch/x86/kernel/i8259_64.c
+++ b/arch/x86/kernel/i8259_64.c
@@ -34,6 +34,20 @@
* interrupt-controller happy.
*/
+#define IRQ_NAME2(nr) nr##_interrupt(void)
+#define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr)
+
+/*
+ * SMP has a few special interrupts for IPI messages
+ */
+
+#define BUILD_IRQ(nr) \
+ asmlinkage void IRQ_NAME(nr); \
+ asm("\n.p2align\n" \
+ "IRQ" #nr "_interrupt:\n\t" \
+ "push $~(" #nr ") ; " \
+ "jmp common_interrupt");
+
#define BI(x,y) \
BUILD_IRQ(x##y)
diff --git a/include/asm-x86/hw_irq_64.h b/include/asm-x86/hw_irq_64.h
index 98c9d494a711..9305f7456a7f 100644
--- a/include/asm-x86/hw_irq_64.h
+++ b/include/asm-x86/hw_irq_64.h
@@ -17,18 +17,4 @@ extern void native_init_IRQ(void);
#include <asm/ptrace.h>
-#define IRQ_NAME2(nr) nr##_interrupt(void)
-#define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr)
-
-/*
- * SMP has a few special interrupts for IPI messages
- */
-
-#define BUILD_IRQ(nr) \
- asmlinkage void IRQ_NAME(nr); \
- asm("\n.p2align\n" \
- "IRQ" #nr "_interrupt:\n\t" \
- "push $~(" #nr ") ; " \
- "jmp common_interrupt");
-
#endif