1 files changed, 9 insertions, 1 deletions

diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index af917f609c7d..ce838abb27d8 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/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);