x86/ioapic: Use legacy_pic to set correct gsi-irq mapping

Using compile time NR_LEGACY_IRQS causes the wrong gsi-irq
mapping on non-PC platforms, such as Moorestown. This patch uses
legacy_pic abstraction to set the correct number of legacy
interrupts at runtime. For Moorestown, nr_legacy_irqs = 0. We
have 1:1 mapping for gsi-irq even within the legacy irq range.

Signed-off-by: Jacob Pan <[email protected]>
Signed-off-by: Dirk Brandewie <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index fb072754bc1d7a30c0eb2e0249a267182dda22aa..9e753663f0d16e6ebd123d2ad65d258d41d88432 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1010,7 +1010,7 @@ static int pin_2_irq(int idx, int apic, int pin)
        } else {
                u32 gsi = gsi_cfg->gsi_base + pin;
 
-               if (gsi >= NR_IRQS_LEGACY)
+               if (gsi >= legacy_pic->nr_legacy_irqs)
                        irq = gsi;
                else
                        irq = gsi_top + gsi;
@@ -3610,7 +3610,7 @@ static void __init probe_nr_irqs_gsi(void)
 {
        int nr;
 
-       nr = gsi_top + NR_IRQS_LEGACY;
+       nr = gsi_top + legacy_pic->nr_legacy_irqs;
        if (nr > nr_irqs_gsi)
                nr_irqs_gsi = nr;