1 files changed, 21 insertions, 2 deletions

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 4353d323f017..af41ba6db960 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -46,6 +46,11 @@ resume_userspace:
         local_irq_disable               # make sure we dont miss an
                                         # interrupt setting need_resched
                                         # between sampling and return
+#ifdef CONFIG_MIPSR2_TO_R6_EMULATOR
+        lw      k0, TI_R2_EMUL_RET($28)
+        bnez    k0, restore_all_from_r2_emul
+#endif
+
         LONG_L  a2, TI_FLAGS($28)       # current->work
         andi    t0, a2, _TIF_WORK_MASK  # (ignoring syscall_trace)
         bnez    t0, work_pending
@@ -114,6 +119,19 @@ restore_partial:		# restore partial frame
         RESTORE_SP_AND_RET
         .set    at
 
+#ifdef CONFIG_MIPSR2_TO_R6_EMULATOR
+restore_all_from_r2_emul:                       # restore full frame
+        .set    noat
+        sw      zero, TI_R2_EMUL_RET($28)       # reset it
+        RESTORE_TEMP
+        RESTORE_AT
+        RESTORE_STATIC
+        RESTORE_SOME
+        LONG_L  sp, PT_R29(sp)
+        eretnc
+        .set    at
+#endif
+
 work_pending:
         andi    t0, a2, _TIF_NEED_RESCHED # a2 is preloaded with TI_FLAGS
         beqz    t0, work_notifysig
@@ -158,7 +176,8 @@ syscall_exit_work:
         jal     syscall_trace_leave
         b       resume_userspace
 
-#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_MIPS_MT)
+#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6) || \
+    defined(CONFIG_MIPS_MT)
 
 /*
  * MIPS32R2 Instruction Hazard Barrier - must be called
@@ -171,4 +190,4 @@ LEAF(mips_ihb)
         nop
         END(mips_ihb)
 
-#endif /* CONFIG_CPU_MIPSR2 or CONFIG_MIPS_MT */
+#endif /* CONFIG_CPU_MIPSR2 or CONFIG_CPU_MIPSR6 or CONFIG_MIPS_MT */