x86/apic: Do not clear nr_irqs_gsi if no legacy irqs
authorJacob Pan <jacob.jun.pan@linux.intel.com>
Thu, 10 Nov 2011 13:42:21 +0000 (13:42 +0000)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Nov 2011 15:20:55 +0000 (16:20 +0100)
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>
arch/x86/kernel/apic/io_apic.c

index 3c31fa98af6dcb23a9298fae4c0ea29495167d0f..841b8da40525aa940a7aa43c70017363c0fa81f8 100644 (file)
@@ -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 =