#include <asm/irq.h>
#include <linux/profile.h>
#include <linux/smp.h>
+#include <linux/percpu.h>
#endif
#define NMI_VECTOR 0x02
#ifndef __ASSEMBLY__
-extern u8 irq_vector[NR_IRQ_VECTORS];
-extern int vector_irq[NR_VECTORS];
-#define IO_APIC_VECTOR(irq) (irq_vector[irq])
+typedef int vector_irq_t[NR_VECTORS];
+DECLARE_PER_CPU(vector_irq_t, vector_irq);
/*
* Various low-level irq details needed by irq.c, process.c,