diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 14:29:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 14:29:58 -0500 |
| commit | 1fd18a871a0761633d02d0536ecb4a311d92a3d3 (patch) | |
| tree | 2f7deb11ace12181473289d45aed06943f80e760 /kernel | |
| parent | 26a9ba160f50115ece48198608002600914932a7 (diff) | |
| parent | e7e7e0c084ef862d5754701108d4a038514d6314 (diff) | |
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: try_one_irq() must be called with irq disabled
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/spurious.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 114e704760fe..bd7273e6282e 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
| @@ -121,7 +121,9 @@ static void poll_all_shared_irqs(void) | |||
| 121 | if (!(status & IRQ_SPURIOUS_DISABLED)) | 121 | if (!(status & IRQ_SPURIOUS_DISABLED)) |
| 122 | continue; | 122 | continue; |
| 123 | 123 | ||
| 124 | local_irq_disable(); | ||
| 124 | try_one_irq(i, desc); | 125 | try_one_irq(i, desc); |
| 126 | local_irq_enable(); | ||
| 125 | } | 127 | } |
| 126 | } | 128 | } |
| 127 | 129 | ||