From 5dc8bcfdb3262f47afb76bba0019330eee9d7f7c Mon Sep 17 00:00:00 2001 From: "Natalie.Protasevich@unisys.com" Date: Fri, 29 Jul 2005 14:03:32 -0700 Subject: [PATCH] --- yaml --- r: 5497 b: refs/heads/master c: e1afc3f522ed088405fc8932110d338330db82bb h: refs/heads/master i: 5495: c569de1ef57870226ca3e447f37e23124b47a085 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/mpparse.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e57335122540..d715ee1ca530 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80625942094b114d85811e5ff1fbc9e06dabe0ff +refs/heads/master: e1afc3f522ed088405fc8932110d338330db82bb diff --git a/trunk/arch/i386/kernel/mpparse.c b/trunk/arch/i386/kernel/mpparse.c index af917f609c7d..ce838abb27d8 100644 --- a/trunk/arch/i386/kernel/mpparse.c +++ b/trunk/arch/i386/kernel/mpparse.c @@ -1116,7 +1116,15 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low) */ int irq = gsi; if (gsi < MAX_GSI_NUM) { - gsi = pci_irq++; + 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);