From 00a3334f7e1360451c71ffcdd4c3ba8d19d074c1 Mon Sep 17 00:00:00 2001 From: "Natalie.Protasevich@unisys.com" Date: Sat, 30 Jul 2005 11:25:32 -0700 Subject: [PATCH] --- yaml --- r: 5523 b: refs/heads/master c: 6a1caa21d66bcb9ba9892435a0a54fc32cd9eeab h: refs/heads/master i: 5521: f6d358635665b6fd871e62155241ec584f79a885 5519: 7b5133f2d25eec6103c9835ae5d5b402432d10b8 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/mpparse.c | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5c31c4aff889..fdb94eb3803e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c70f5d6610c601ea2ae4ae4e49f66c80801e895f +refs/heads/master: 6a1caa21d66bcb9ba9892435a0a54fc32cd9eeab diff --git a/trunk/arch/x86_64/kernel/mpparse.c b/trunk/arch/x86_64/kernel/mpparse.c index 08abf9f5b159..79c362d03e2e 100644 --- a/trunk/arch/x86_64/kernel/mpparse.c +++ b/trunk/arch/x86_64/kernel/mpparse.c @@ -970,8 +970,21 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low) * due to unused I/O APIC pins. */ int irq = gsi; - gsi = pci_irq++; - gsi_to_irq[irq] = gsi; + if (gsi < MAX_GSI_NUM) { + if (gsi > 15) + gsi = pci_irq++; +#ifdef CONFIG_ACPI_BUS + /* + * Don't assign IRQ used by ACPI SCI + */ + if (gsi == acpi_fadt.sci_int) + gsi = pci_irq++; +#endif + gsi_to_irq[irq] = gsi; + } else { + printk(KERN_ERR "GSI %u is too high\n", gsi); + return gsi; + } } io_apic_set_pci_routing(ioapic, ioapic_pin, gsi,