From b940d22d58c41b2ae491dca9232850f6f38f3653 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Sun, 8 Oct 2006 07:43:46 -0600 Subject: [PATCH] i386/x86_64: Remove global IO_APIC_VECTOR Which vector an irq is assigned to now varies dynamically and is not needed outside of io_apic.c. So remove the possibility of accessing the information outside of io_apic.c and remove the silly macro that makes looking for users of irq_vector difficult. The fact this compiles ensures there aren't any more pieces of the old CONFIG_PCI_MSI weirdness that I failed to remove. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds --- arch/x86_64/kernel/io_apic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arch/x86_64') diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 91728d9d347..9c3b9b19d69 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c @@ -587,8 +587,8 @@ static int __assign_irq_vector(int irq, cpumask_t mask) BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); - if (IO_APIC_VECTOR(irq) > 0) - old_vector = IO_APIC_VECTOR(irq); + if (irq_vector[irq] > 0) + old_vector = irq_vector[irq]; if ((old_vector > 0) && cpu_isset(old_vector >> 8, mask)) { return old_vector; } @@ -620,7 +620,7 @@ next: } per_cpu(vector_irq, cpu)[vector] = irq; vector |= cpu << 8; - IO_APIC_VECTOR(irq) = vector; + irq_vector[irq] = vector; return vector; } return -ENOSPC; @@ -1289,7 +1289,7 @@ static inline void init_IO_APIC_traps(void) */ for (irq = 0; irq < NR_IRQS ; irq++) { int tmp = irq; - if (IO_APIC_IRQ(tmp) && !IO_APIC_VECTOR(tmp)) { + if (IO_APIC_IRQ(tmp) && !irq_vector[tmp]) { /* * Hmm.. We don't have an entry for this, * so default to an old-fashioned 8259 -- cgit v1.2.3