diff --git a/[refs] b/[refs] index 3a790ba587cf..5b78ffc6834f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2609f6aa2dce5d960ea1fe32f57524c315dede5 +refs/heads/master: f5de6ecc84b58ba0f394365eafc8681af7a4f73d diff --git a/trunk/arch/alpha/kernel/irq.c b/trunk/arch/alpha/kernel/irq.c index 5912900a42eb..9ab234f48dd8 100644 --- a/trunk/arch/alpha/kernel/irq.c +++ b/trunk/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(); } -