diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 12:16:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 12:16:07 -0700 |
| commit | db6c24fdf19bd7ee25c86ddd8021ec648b76d5ae (patch) | |
| tree | 566723870f0df122ed6852c02b0ab7a258c550bc /arch/blackfin/kernel/irqchip.c | |
| parent | a4480ac4f966384f9d2db98bffec223e4eaf6150 (diff) | |
| parent | 8d0a60032ffd472f0f7821ff388e9f438c06077a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: fix up section mismatch warning
Blackfin arch: fix bug - kernel boot fails when Spinlock and rw-lock debugging enabled
Diffstat (limited to 'arch/blackfin/kernel/irqchip.c')
| -rw-r--r-- | arch/blackfin/kernel/irqchip.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index 73647c15877..07402f57c9d 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c @@ -60,9 +60,14 @@ static struct irq_chip bad_chip = { }; static struct irq_desc bad_irq_desc = { + .status = IRQ_DISABLED, .chip = &bad_chip, .handle_irq = handle_bad_irq, .depth = 1, + .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), +#ifdef CONFIG_SMP + .affinity = CPU_MASK_ALL +#endif }; int show_interrupts(struct seq_file *p, void *v) |