1 files changed, 2 insertions, 8 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index ddddaed91872..4433a4be8171 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -408,10 +408,6 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
         if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
                 return gsi;
 
-        /* Don't set up the ACPI SCI because it's already set up */
-        if (acpi_gbl_FADT.sci_interrupt == gsi)
-                return mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC);
-
         trigger = trigger == ACPI_EDGE_SENSITIVE ? 0 : 1;
         polarity = polarity == ACPI_ACTIVE_HIGH ? 0 : 1;
         node = dev ? dev_to_node(dev) : NUMA_NO_NODE;
@@ -424,7 +420,8 @@ static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
         if (irq < 0)
                 return irq;
 
-        if (enable_update_mptable)
+        /* Don't set up the ACPI SCI because it's already set up */
+        if (enable_update_mptable && acpi_gbl_FADT.sci_interrupt != gsi)
                 mp_config_acpi_gsi(dev, gsi, trigger, polarity);
 
         return irq;
@@ -437,9 +434,6 @@ static void mp_unregister_gsi(u32 gsi)
         if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
                 return;
 
-        if (acpi_gbl_FADT.sci_interrupt == gsi)
-                return;
-
         irq = mp_map_gsi_to_irq(gsi, 0);
         if (irq > 0)
                 mp_unmap_irq(irq);