summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/process.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 14:25:59 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-14 14:25:59 -0800
commit1b79dff672ca09a5461cc1d46ad81c62137841c5 (patch)
tree772a4224c78aa20862511ae5f7272f9311e4811c /arch/mips/kernel/process.c
parent83050a4e21979fe1821916fce2fca36255569ed3 (diff)
parent18558cae0272f8fd9647e69d3fec1565a7949865 (diff)
downloadop-kernel-dev-1b79dff672ca09a5461cc1d46ad81c62137841c5.zip
op-kernel-dev-1b79dff672ca09a5461cc1d46ad81c62137841c5.tar.gz
Merge 4.5-rc4 into char-misc-next
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/kernel/process.c')
-rw-r--r--arch/mips/kernel/process.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index f2975d4..eddd5fd 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -65,12 +65,10 @@ void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
status = regs->cp0_status & ~(ST0_CU0|ST0_CU1|ST0_FR|KU_MASK);
status |= KU_USER;
regs->cp0_status = status;
+ lose_fpu(0);
+ clear_thread_flag(TIF_MSA_CTX_LIVE);
clear_used_math();
- clear_fpu_owner();
init_dsp();
- clear_thread_flag(TIF_USEDMSA);
- clear_thread_flag(TIF_MSA_CTX_LIVE);
- disable_msa();
regs->cp0_epc = pc;
regs->regs[29] = sp;
}
OpenPOWER on IntegriCloud