Merge tag 'powerpc-5.13-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / drivers / acpi / irq.c

diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
index e209081..c68e694 100644 (file)
--- a/drivers/acpi/irq.c
+++ b/drivers/acpi/irq.c
@@ -75,8 +75,12 @@ void acpi_unregister_gsi(u32 gsi)
 {
        struct irq_domain *d = irq_find_matching_fwnode(acpi_gsi_domain_id,
                                                        DOMAIN_BUS_ANY);
-       int irq = irq_find_mapping(d, gsi);
+       int irq;
 
+       if (WARN_ON(acpi_irq_model == ACPI_IRQ_MODEL_GIC && gsi < 16))
+               return;
+
+       irq = irq_find_mapping(d, gsi);
        irq_dispose_mapping(irq);
 }
 EXPORT_SYMBOL_GPL(acpi_unregister_gsi);