diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 09:17:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 09:17:41 -0800 |
| commit | aba99437f5af7a419a82438f7fab16bb3ddd9b44 (patch) | |
| tree | b3b36b2d1c4b462519292f8c56dd2098ede637a1 | |
| parent | 49abda98929a100cd6309da8dca29db84c72c721 (diff) | |
| parent | f1a06390d013244e721372b3f9b66e39b6429c71 (diff) | |
| download | linux-stable-aba99437f5af7a419a82438f7fab16bb3ddd9b44.tar.gz linux-stable-aba99437f5af7a419a82438f7fab16bb3ddd9b44.tar.bz2 linux-stable-aba99437f5af7a419a82438f7fab16bb3ddd9b44.zip | |
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
genirq: Prevent irq storm on migration
| -rw-r--r-- | kernel/irq/migration.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index 1d2541940480..441fd629ff04 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c @@ -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); } - |