1 files changed, 20 insertions, 3 deletions

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 6ae540e133b2..60e39dc7f1eb 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -32,6 +32,7 @@
 #include <asm/cpu.h>
 #include <asm/dsp.h>
 #include <asm/fpu.h>
+#include <asm/msa.h>
 #include <asm/pgtable.h>
 #include <asm/mipsregs.h>
 #include <asm/processor.h>
@@ -65,6 +66,8 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
         clear_used_math();
         clear_fpu_owner();
         init_dsp();
+        clear_thread_flag(TIF_MSA_CTX_LIVE);
+        disable_msa();
         regs->cp0_epc = pc;
         regs->regs[29] = sp;
 }
@@ -89,7 +92,9 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 
         preempt_disable();
 
-        if (is_fpu_owner())
+        if (is_msa_enabled())
+                save_msa(p);
+        else if (is_fpu_owner())
                 save_fp(p);
 
         if (cpu_has_dsp)
@@ -157,7 +162,13 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 /* Fill in the fpu structure for a core dump.. */
 int dump_fpu(struct pt_regs *regs, elf_fpregset_t *r)
 {
-        memcpy(r, &current->thread.fpu, sizeof(current->thread.fpu));
+        int i;
+
+        for (i = 0; i < NUM_FPU_REGS; i++)
+                memcpy(&r[i], &current->thread.fpu.fpr[i], sizeof(*r));
+
+        memcpy(&r[NUM_FPU_REGS], &current->thread.fpu.fcr31,
+               sizeof(current->thread.fpu.fcr31));
 
         return 1;
 }
@@ -192,7 +203,13 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
 
 int dump_task_fpu(struct task_struct *t, elf_fpregset_t *fpr)
 {
-        memcpy(fpr, &t->thread.fpu, sizeof(current->thread.fpu));
+        int i;
+
+        for (i = 0; i < NUM_FPU_REGS; i++)
+                memcpy(&fpr[i], &t->thread.fpu.fpr[i], sizeof(*fpr));
+
+        memcpy(&fpr[NUM_FPU_REGS], &t->thread.fpu.fcr31,
+               sizeof(t->thread.fpu.fcr31));
 
         return 1;
 }