diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 1ed84577d3e318c50b6a1546fafd39440c6ddc8f..4716b89543a9f87984f7e52891d76ca07d86cada 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1097,6 +1097,8 @@ static int enable_restore_fp_context(int msa)
 		if (msa && !err) {
 			enable_msa();
 			_init_msa_upper();
+			set_thread_flag(TIF_USEDMSA);
+			set_thread_flag(TIF_MSA_CTX_LIVE);
 		}
 		if (!err)
 			set_used_math();