diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-08 16:48:51 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-08 16:48:51 +0100 |
commit | dba58e39ced7af63f2748d12bbb2b4ac83c72391 (patch) | |
tree | ee15a5e7667b51d0d0f7e8cb39064652f7c84c28 /kernel/irq/chip.c | |
parent | tracing: trace_bprintk() cleanups (diff) | |
parent | x86: implement atomic text_poke() via fixmap (diff) | |
download | linux-dba58e39ced7af63f2748d12bbb2b4ac83c72391.tar.xz linux-dba58e39ced7af63f2748d12bbb2b4ac83c72391.zip |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'tracing/textedit' into tracing/core
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r-- | kernel/irq/chip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 7de11bd64dfe..122fef4b0bd3 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -46,7 +46,10 @@ void dynamic_irq_init(unsigned int irq) desc->irq_count = 0; desc->irqs_unhandled = 0; #ifdef CONFIG_SMP - cpumask_setall(&desc->affinity); + cpumask_setall(desc->affinity); +#ifdef CONFIG_GENERIC_PENDING_IRQ + cpumask_clear(desc->pending_mask); +#endif #endif spin_unlock_irqrestore(&desc->lock, flags); } |