diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:30:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:30:31 -0500 |
| commit | bed4f13065b520e564adffbfcd1c1a764a9c887e (patch) | |
| tree | d847ddd3bab64cb126ee6679dc4a949386554d55 /arch/x86/include/asm/hw_irq.h | |
| parent | 3e5621edb3392b28efb260ac99b2d26fb8b44e73 (diff) | |
| parent | bf8bd66d0580f296f257d371ee41a0a137b541c7 (diff) | |
Merge branch 'x86/irq' into x86/core
Diffstat (limited to 'arch/x86/include/asm/hw_irq.h')
| -rw-r--r-- | arch/x86/include/asm/hw_irq.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index b97aecb0b61..8de644b6b95 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h | |||
| @@ -109,9 +109,7 @@ extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *); | |||
| 109 | #endif | 109 | #endif |
| 110 | #endif | 110 | #endif |
| 111 | 111 | ||
| 112 | #ifdef CONFIG_X86_32 | 112 | extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void); |
| 113 | extern void (*const interrupt[NR_VECTORS])(void); | ||
| 114 | #endif | ||
| 115 | 113 | ||
| 116 | typedef int vector_irq_t[NR_VECTORS]; | 114 | typedef int vector_irq_t[NR_VECTORS]; |
| 117 | DECLARE_PER_CPU(vector_irq_t, vector_irq); | 115 | DECLARE_PER_CPU(vector_irq_t, vector_irq); |