diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-02 15:55:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-05-12 15:28:05 -0400 |
commit | 0bc471d93051a19545257909bc2ed2ad3b389b54 (patch) | |
tree | cec90d957c3ce84ef12077f7d16a057b264dc848 | |
parent | 9b7dc567d03d74a1fbae84e88949b6a60d922d82 (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.c | 14 | ||||
-rw-r--r-- | include/asm-x86/hw_irq_64.h | 14 |
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 @@ | |||
34 | * interrupt-controller happy. | 34 | * interrupt-controller happy. |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #define IRQ_NAME2(nr) nr##_interrupt(void) | ||
38 | #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr) | ||
39 | |||
40 | /* | ||
41 | * SMP has a few special interrupts for IPI messages | ||
42 | */ | ||
43 | |||
44 | #define BUILD_IRQ(nr) \ | ||
45 | asmlinkage void IRQ_NAME(nr); \ | ||
46 | asm("\n.p2align\n" \ | ||
47 | "IRQ" #nr "_interrupt:\n\t" \ | ||
48 | "push $~(" #nr ") ; " \ | ||
49 | "jmp common_interrupt"); | ||
50 | |||
37 | #define BI(x,y) \ | 51 | #define BI(x,y) \ |
38 | BUILD_IRQ(x##y) | 52 | BUILD_IRQ(x##y) |
39 | 53 | ||
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); | |||
17 | 17 | ||
18 | #include <asm/ptrace.h> | 18 | #include <asm/ptrace.h> |
19 | 19 | ||
20 | #define IRQ_NAME2(nr) nr##_interrupt(void) | ||
21 | #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr) | ||
22 | |||
23 | /* | ||
24 | * SMP has a few special interrupts for IPI messages | ||
25 | */ | ||
26 | |||
27 | #define BUILD_IRQ(nr) \ | ||
28 | asmlinkage void IRQ_NAME(nr); \ | ||
29 | asm("\n.p2align\n" \ | ||
30 | "IRQ" #nr "_interrupt:\n\t" \ | ||
31 | "push $~(" #nr ") ; " \ | ||
32 | "jmp common_interrupt"); | ||
33 | |||
34 | #endif | 20 | #endif |