1 files changed, 1 insertions, 1 deletions

diff --git a/arch/mips/include/asm/switch_to.h b/arch/mips/include/asm/switch_to.h
index e92d6c4b5ed1..7163cd7fdd69 100644
--- a/arch/mips/include/asm/switch_to.h
+++ b/arch/mips/include/asm/switch_to.h
@@ -104,7 +104,6 @@ do {									\
         if (test_and_clear_tsk_thread_flag(prev, TIF_USEDMSA))          \
                 __fpsave = FP_SAVE_VECTOR;                              \
         (last) = resume(prev, next, task_thread_info(next), __fpsave);  \
-        disable_msa();                                                  \
 } while (0)
 
 #define finish_arch_switch(prev)                                        \
@@ -122,6 +121,7 @@ do {									\
         if (cpu_has_userlocal)                                          \
                 write_c0_userlocal(current_thread_info()->tp_value);    \
         __restore_watch();                                              \
+        disable_msa();                                                  \
 } while (0)
 
 #endif /* _ASM_SWITCH_TO_H */