Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[linux-drm-fsl-dcu.git] / arch / mips / dec / int-handler.S

diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index e8ec93e33fe60cc05eb0c7503992cbca38581d7b..b251ef864c33b281fa899a295c266f10f48db98d 100644 (file)
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -13,7 +13,6 @@
  * Rewritten extensively for controller-driven IRQ support
  * by Maciej W. Rozycki.
  */
-#include <linux/config.h>
 
 #include <asm/addrspace.h>
 #include <asm/asm.h>
@@ -265,10 +264,10 @@
                 srlv   t3,t1,t2
 
 handle_it:
-               jal     do_IRQ
-                move   a1,sp
-
-               j       ret_from_irq
+               LONG_L  s0, TI_REGS($28)
+               LONG_S  sp, TI_REGS($28)
+               PTR_LA  ra, ret_from_irq
+               j       dec_irq_dispatch
                 nop
 
 #ifdef CONFIG_32BIT
@@ -278,9 +277,8 @@ fpu:
 #endif
 
 spurious:
-               jal     spurious_interrupt
-                nop
-               j       ret_from_irq
+               PTR_LA  ra, _ret_from_irq
+               j       spurious_interrupt
                 nop
                END(plat_irq_dispatch)