Pull bugzilla-9683 into release branch

[karo-tx-linux.git] / arch / mips / dec / int-handler.S

diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 55d60d5e0e86fb03c4586b52fb39ee6dce03cdbe..00cecdcc75f215cb6e5a6581442774996fcc26f3 100644 (file)
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -264,12 +264,7 @@
                 srlv   t3,t1,t2
 
 handle_it:
-               LONG_L  s0, TI_REGS($28)
-               LONG_S  sp, TI_REGS($28)
-               jal     do_IRQ
-               LONG_S  s0, TI_REGS($28)
-
-               j       ret_from_irq
+               j       dec_irq_dispatch
                 nop
 
 #ifdef CONFIG_32BIT
@@ -279,9 +274,7 @@ fpu:
 #endif
 
 spurious:
-               jal     spurious_interrupt
-                nop
-               j       ret_from_irq
+               j       spurious_interrupt
                 nop
                END(plat_irq_dispatch)