2 files changed, 4 insertions, 1 deletions

diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h
index 2f182bdf024f..6c74a804fe98 100644
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
@@ -364,9 +364,13 @@
 
                 .macro  RESTORE_SP_AND_RET
                 LONG_L  sp, PT_R29(sp)
+#ifdef CONFIG_CPU_MIPSR6
+                eretnc
+#else
                 .set    arch=r4000
                 eret
                 .set    mips0
+#endif
                 .endm
 
 #endif
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
index e309d8fcb516..b439e512792b 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@@ -27,7 +27,6 @@ struct thread_info {
         unsigned long           tp_value;       /* thread pointer */
         __u32                   cpu;            /* current CPU */
         int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
-        int                     r2_emul_return; /* 1 => Returning from R2 emulator */
         mm_segment_t            addr_limit;     /*
                                                  * thread address space limit:
                                                  * 0x7fffffff for user-thead