genirq: Reserve the irq when calling irq_set_chip()
authorDavid Daney <ddaney@caviumnetworks.com>
Fri, 25 Mar 2011 19:38:48 +0000 (12:38 -0700)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 27 Mar 2011 15:45:58 +0000 (17:45 +0200)
The helper macros and functions like for_each_active_irq() don't work
unless the irq is in the allocated_irqs set.

In the case of !CONFIG_SPARSE_IRQ, instead of forcing all users of the
irq infrastructure to explicitly call irq_reserve_irq(), do it for
them.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: linux-mips@linux-mips.org
Cc: ralf@linux-mips.org
LKML-Reference: <1301081931-11240-2-git-send-email-ddaney@caviumnetworks.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/irq/chip.c

index c9c0601f0615a1eaef8e3c425c61662395987c8e..c35d74c08b5077b40c329ff0e3b5f465d484c87c 100644 (file)
@@ -37,6 +37,12 @@ int irq_set_chip(unsigned int irq, struct irq_chip *chip)
        irq_chip_set_defaults(chip);
        desc->irq_data.chip = chip;
        irq_put_desc_unlock(desc, flags);
+       /*
+        * For !CONFIG_SPARSE_IRQ make the irq show up in
+        * allocated_irqs. For the CONFIG_SPARSE_IRQ case, it is
+        * already marked, and this call is harmless.
+        */
+       irq_reserve_irq(irq);
        return 0;
 }
 EXPORT_SYMBOL(irq_set_chip);