diff options
author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2006-03-09 20:33:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-09 22:47:37 -0500 |
commit | eff2c2f6f569267aa52e2431844cec30637d7ade (patch) | |
tree | 9548511bccd76c8af891a490e314c986072f3997 /arch | |
parent | 10ad1b7363090c0eec2b4054a5a3b82d2cc09ee5 (diff) |
[PATCH] alpha: fix IRQ handling lockup
Fix a lockup which was introduced during the conversion to the generic IRQ
framework.
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/kernel/irq.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c index 9006063e736..da677f829f7 100644 --- a/arch/alpha/kernel/irq.c +++ b/arch/alpha/kernel/irq.c | |||
@@ -151,8 +151,13 @@ handle_irq(int irq, struct pt_regs * regs) | |||
151 | } | 151 | } |
152 | 152 | ||
153 | irq_enter(); | 153 | irq_enter(); |
154 | /* | ||
155 | * __do_IRQ() must be called with IPL_MAX. Note that we do not | ||
156 | * explicitly enable interrupts afterwards - some MILO PALcode | ||
157 | * (namely LX164 one) seems to have severe problems with RTI | ||
158 | * at IPL 0. | ||
159 | */ | ||
154 | local_irq_disable(); | 160 | local_irq_disable(); |
155 | __do_IRQ(irq, regs); | 161 | __do_IRQ(irq, regs); |
156 | local_irq_enable(); | ||
157 | irq_exit(); | 162 | irq_exit(); |
158 | } | 163 | } |