From 6d4c906aa20d7f58b239bc5308b80103790f9c5a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 2 May 2008 21:55:12 +0200 Subject: [PATCH] --- yaml --- r: 99649 b: refs/heads/master c: 0bc471d93051a19545257909bc2ed2ad3b389b54 h: refs/heads/master i: 99647: 6924be019949b434ae9c44c89172558eb5952924 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/i8259_64.c | 14 ++++++++++++++ trunk/include/asm-x86/hw_irq_64.h | 14 -------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 96d10f04de95..f6bd019a417c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b7dc567d03d74a1fbae84e88949b6a60d922d82 +refs/heads/master: 0bc471d93051a19545257909bc2ed2ad3b389b54 diff --git a/trunk/arch/x86/kernel/i8259_64.c b/trunk/arch/x86/kernel/i8259_64.c index fa57a1568508..c4ae4769ce67 100644 --- a/trunk/arch/x86/kernel/i8259_64.c +++ b/trunk/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/trunk/include/asm-x86/hw_irq_64.h b/trunk/include/asm-x86/hw_irq_64.h index 98c9d494a711..9305f7456a7f 100644 --- a/trunk/include/asm-x86/hw_irq_64.h +++ b/trunk/include/asm-x86/hw_irq_64.h @@ -17,18 +17,4 @@ extern void native_init_IRQ(void); #include -#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