diff options
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/kernel/io_apic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index 91728d9d3472..9c3b9b19d699 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) | |||
587 | 587 | ||
588 | BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); | 588 | BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); |
589 | 589 | ||
590 | if (IO_APIC_VECTOR(irq) > 0) | 590 | if (irq_vector[irq] > 0) |
591 | old_vector = IO_APIC_VECTOR(irq); | 591 | old_vector = irq_vector[irq]; |
592 | if ((old_vector > 0) && cpu_isset(old_vector >> 8, mask)) { | 592 | if ((old_vector > 0) && cpu_isset(old_vector >> 8, mask)) { |
593 | return old_vector; | 593 | return old_vector; |
594 | } | 594 | } |
@@ -620,7 +620,7 @@ next: | |||
620 | } | 620 | } |
621 | per_cpu(vector_irq, cpu)[vector] = irq; | 621 | per_cpu(vector_irq, cpu)[vector] = irq; |
622 | vector |= cpu << 8; | 622 | vector |= cpu << 8; |
623 | IO_APIC_VECTOR(irq) = vector; | 623 | irq_vector[irq] = vector; |
624 | return vector; | 624 | return vector; |
625 | } | 625 | } |
626 | return -ENOSPC; | 626 | return -ENOSPC; |
@@ -1289,7 +1289,7 @@ static inline void init_IO_APIC_traps(void) | |||
1289 | */ | 1289 | */ |
1290 | for (irq = 0; irq < NR_IRQS ; irq++) { | 1290 | for (irq = 0; irq < NR_IRQS ; irq++) { |
1291 | int tmp = irq; | 1291 | int tmp = irq; |
1292 | if (IO_APIC_IRQ(tmp) && !IO_APIC_VECTOR(tmp)) { | 1292 | if (IO_APIC_IRQ(tmp) && !irq_vector[tmp]) { |
1293 | /* | 1293 | /* |
1294 | * Hmm.. We don't have an entry for this, | 1294 | * Hmm.. We don't have an entry for this, |
1295 | * so default to an old-fashioned 8259 | 1295 | * so default to an old-fashioned 8259 |