diff options
author | David Daney <ddaney@caviumnetworks.com> | 2011-03-25 15:38:48 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-27 11:45:58 -0400 |
commit | d72274e5895d11570a0a4a3214a1933c86d5ccb7 (patch) | |
tree | 3925786563e67241cc5798ebbbcf79c0ce738f69 /kernel/irq/chip.c | |
parent | 16c29dafcc86024048f1dbb8349d31cb22c7c55a (diff) |
genirq: Reserve the irq when calling irq_set_chip()
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>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r-- | kernel/irq/chip.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index c9c0601f0615..c35d74c08b50 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -37,6 +37,12 @@ int irq_set_chip(unsigned int irq, struct irq_chip *chip) | |||
37 | irq_chip_set_defaults(chip); | 37 | irq_chip_set_defaults(chip); |
38 | desc->irq_data.chip = chip; | 38 | desc->irq_data.chip = chip; |
39 | irq_put_desc_unlock(desc, flags); | 39 | irq_put_desc_unlock(desc, flags); |
40 | /* | ||
41 | * For !CONFIG_SPARSE_IRQ make the irq show up in | ||
42 | * allocated_irqs. For the CONFIG_SPARSE_IRQ case, it is | ||
43 | * already marked, and this call is harmless. | ||
44 | */ | ||
45 | irq_reserve_irq(irq); | ||
40 | return 0; | 46 | return 0; |
41 | } | 47 | } |
42 | EXPORT_SYMBOL(irq_set_chip); | 48 | EXPORT_SYMBOL(irq_set_chip); |