irq fix
Linus,
Please pull the latest irq-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-fixes-for-linus
Thanks,
Ingo
------------------>
Thomas Gleixner (1):
genirq: Prevent irq storm on migration
kernel/irq/migration.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
kernel/irq/migration.c +11 -3
@@ -56,6 +56,7 @@ void move_masked_irq(int irq)void move_native_irq (int irq) {struct irq_desc *desc =irq_to_desc (irq); +bool masked;if (likely (!(desc->status &IRQ_MOVE_PENDING )))return ;
@@ -63,8 +64,15 @@ void move_native_irq(int irq)if (unlikely (desc->status &IRQ_DISABLED ))return ; - desc->irq_data.chip->irq_mask (&desc->irq_data); +/* +* Be careful vs. already masked interrupts. If this is a +* threaded interrupt with ONESHOT set, we can end up with an +* interrupt storm. +*/ + masked = desc->status &IRQ_MASKED ; +if (!masked) + desc->irq_data.chip->irq_mask (&desc->irq_data);move_masked_irq (irq); - desc->irq_data.chip->irq_unmask (&desc->irq_data); +if (!masked) + desc->irq_data.chip->irq_unmask (&desc->irq_data); } -