Skip to content

Commit

Permalink
x86/apic: Do not clear nr_irqs_gsi if no legacy irqs
Browse files Browse the repository at this point in the history
nr_legacy_irqs is set in probe_nr_irqs_gsi, we should not clear
it after that. Otherwise, the result is that MSI irqs will be
allocated from the wrong range for the systems without legacy
PIC.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Jacob Pan authored and Ingo Molnar committed Nov 10, 2011
1 parent cf8ff6b commit bb84ac2
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/x86/kernel/apic/io_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,8 @@ int __init arch_early_irq_init(void)
struct irq_cfg *cfg;
int count, node, i;

if (!legacy_pic->nr_legacy_irqs) {
nr_irqs_gsi = 0;
if (!legacy_pic->nr_legacy_irqs)
io_apic_irqs = ~0UL;
}

for (i = 0; i < nr_ioapics; i++) {
ioapics[i].saved_registers =
Expand Down

0 comments on commit bb84ac2

Please sign in to comment.