diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-06-05 03:13:11 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-12 06:15:36 -0400 |
commit | bf664c0a3a42683b78d74aca2d7cfb6ccc2aa2c3 (patch) | |
tree | b1d5c08b75cd69e4061b8a5d1cbeab80bf0364e2 /arch/blackfin/kernel/irqchip.c | |
parent | ce0bf52dd3f9d980889190bc6097f1756b71eb8c (diff) |
Blackfin: fix sparseirq/kstat_irqs fallout
The sparseirq changes (d7e51e66) played poorly with the Blackfin irqchip
implementation as we're still using the old hardirq method. Our bad irq
structure had a NULL kstat_irqs field so when all the common code tries
to increment this field, everything goes big bada boom.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/kernel/irqchip.c')
-rw-r--r-- | arch/blackfin/kernel/irqchip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index 401bd32aa499..6e31e935bb31 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c | |||
@@ -59,12 +59,14 @@ static struct irq_chip bad_chip = { | |||
59 | .unmask = dummy_mask_unmask_irq, | 59 | .unmask = dummy_mask_unmask_irq, |
60 | }; | 60 | }; |
61 | 61 | ||
62 | static int bad_stats; | ||
62 | static struct irq_desc bad_irq_desc = { | 63 | static struct irq_desc bad_irq_desc = { |
63 | .status = IRQ_DISABLED, | 64 | .status = IRQ_DISABLED, |
64 | .chip = &bad_chip, | 65 | .chip = &bad_chip, |
65 | .handle_irq = handle_bad_irq, | 66 | .handle_irq = handle_bad_irq, |
66 | .depth = 1, | 67 | .depth = 1, |
67 | .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), | 68 | .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), |
69 | .kstat_irqs = &bad_stats, | ||
68 | #ifdef CONFIG_SMP | 70 | #ifdef CONFIG_SMP |
69 | .affinity = CPU_MASK_ALL | 71 | .affinity = CPU_MASK_ALL |
70 | #endif | 72 | #endif |