X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Fasm-x86%2Fhw_irq.h;h=39c7a4745d2542e1a6f29ea80c42988275d0fac9;hb=bcd562607f17b0c9f9ae96af849894dd06645f63;hp=50f6e0316b5029c4c2e5801bcd256119c3f037aa;hpb=20272c8994cf1e1f8ed745a2ea161dd9ad3889f2;p=deliverable%2Flinux.git

diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h
index 50f6e0316b50..39c7a4745d25 100644
--- a/include/asm-x86/hw_irq.h
+++ b/include/asm-x86/hw_irq.h
@@ -115,13 +115,13 @@ extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *);
 #endif
 
 #ifdef CONFIG_X86_32
-extern void (*const interrupt[NR_IRQS])(void);
-#else
+extern void (*const interrupt[NR_VECTORS])(void);
+#endif
+
 typedef int vector_irq_t[NR_VECTORS];
 DECLARE_PER_CPU(vector_irq_t, vector_irq);
-#endif
 
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_X86_64)
+#ifdef CONFIG_X86_IO_APIC
 extern void lock_vector_lock(void);
 extern void unlock_vector_lock(void);
 extern void __setup_vector_irq(int cpu);