Merge branch 'sfc-3.9' into master

[karo-tx-linux.git] / arch / mips / kernel / smtc-asm.S

diff --git a/arch/mips/kernel/smtc-asm.S b/arch/mips/kernel/smtc-asm.S
index 1cb9441f1474f76692319df943b8ee20b4bf994a..76016ac0a9c8818960e61f055ac47e4d55a9bdf2 100644 (file)
--- a/arch/mips/kernel/smtc-asm.S
+++ b/arch/mips/kernel/smtc-asm.S
@@ -65,7 +65,7 @@ FEXPORT(__smtc_ipi_vector)
 1:
        /*
         * The IPI sender has put some information on the anticipated
-        * kernel stack frame.  If we were in user mode, this will be
+        * kernel stack frame.  If we were in user mode, this will be
         * built above the saved kernel SP.  If we were already in the
         * kernel, it will be built above the current CPU SP.
         *
@@ -101,7 +101,9 @@ FEXPORT(__smtc_ipi_vector)
        lw      t0,PT_PADSLOT5(sp)
        /* Argument from sender passed in stack pad slot 4 */
        lw      a0,PT_PADSLOT4(sp)
-       PTR_LA  ra, _ret_from_irq
+       LONG_L  s0, TI_REGS($28)
+       LONG_S  sp, TI_REGS($28)
+       PTR_LA  ra, ret_from_irq
        jr      t0
 
 /*