alpha: fix WARN_ON in __local_bh_enable()

Interrupts ought to be disabled _before_ irq_enter().

Signed-off-by: Ivan Kokshaysky <[email protected]>
Signed-off-by: Matt Turner <[email protected]>

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index 5912900a42ebc0e00ca19492280c5380adba6062..9ab234f48dd899c2ad0f9c9a34ecbc5bc8ef449b 100644 (file)
--- 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();
 }
-