From: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Date: Wed, 12 Jan 2011 22:02:24 +0000 (+0000)
Subject: alpha: fix WARN_ON in __local_bh_enable()
X-Git-Tag: MMI-PSA29.97-13-9~20993^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f5de6ecc84b58ba0f394365eafc8681af7a4f73d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

alpha: fix WARN_ON in __local_bh_enable()

Interrupts ought to be disabled _before_ irq_enter().

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Matt Turner <mattst88@monolith.freenet-rz.de>
---

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index 5912900a42eb..9ab234f48dd8 100644
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -160,15 +160,14 @@ handle_irq(int irq)
 		return;
 	}
 
-	irq_enter();
 	/*
-	 * handle_irq() must be called with IPL_MAX. Note that we do not
+	 * From here we must proceed with IPL_MAX. Note that we do not
 	 * explicitly enable interrupts afterwards - some MILO PALcode
 	 * (namely LX164 one) seems to have severe problems with RTI
 	 * at IPL 0.
 	 */
 	local_irq_disable();
+	irq_enter();
 	generic_handle_irq_desc(irq, desc);
 	irq_exit();
 }
-