MIPS: Remove r2_emul_return from struct thread_info

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

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 7791840cf22c0f7c058d32f3abb722eb132f90f8..8d83fc2a96b7196b47367fe8bfb6a39b0f67730e 100644 (file)
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -47,11 +47,6 @@ 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
@@ -120,19 +115,6 @@ 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