summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2015-01-15 16:11:06 +0300
committerRalf Baechle <ralf@linux-mips.org>2015-02-20 15:28:51 +0100
commitd6e41525e356a8dc4b9ad6249a644d4123240881 (patch)
treea275601c4a4283de4494999f0520e91a3746fc3a /arch
parentac655fb7626ea63b12ee5f449a082c79db6d2f26 (diff)
downloadlinux-stable-d6e41525e356a8dc4b9ad6249a644d4123240881.tar.gz
linux-stable-d6e41525e356a8dc4b9ad6249a644d4123240881.tar.bz2
linux-stable-d6e41525e356a8dc4b9ad6249a644d4123240881.zip
MIPS: OCTEON: Fix FP context save.
It wasn't being saved on task switch. Signed-off-by: David Daney <david.daney@cavium.com> Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/8934/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/octeon_switch.S19
1 files changed, 7 insertions, 12 deletions
diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S
index 3dec1e8becf0..2787c014ec56 100644
--- a/arch/mips/kernel/octeon_switch.S
+++ b/arch/mips/kernel/octeon_switch.S
@@ -31,15 +31,11 @@
/*
* check if we need to save FPU registers
*/
- PTR_L t3, TASK_THREAD_INFO(a0)
- LONG_L t0, TI_FLAGS(t3)
- li t1, _TIF_USEDFPU
- and t2, t0, t1
- beqz t2, 1f
- nor t1, zero, t1
-
- and t0, t0, t1
- LONG_S t0, TI_FLAGS(t3)
+ .set push
+ .set noreorder
+ beqz a3, 1f
+ PTR_L t3, TASK_THREAD_INFO(a0)
+ .set pop
/*
* clear saved user stack CU1 bit
@@ -57,14 +53,13 @@
1:
/* check if we need to save COP2 registers */
- PTR_L t2, TASK_THREAD_INFO(a0)
- LONG_L t0, ST_OFF(t2)
+ LONG_L t0, ST_OFF(t3)
bbit0 t0, 30, 1f
/* Disable COP2 in the stored process state */
li t1, ST0_CU2
xor t0, t1
- LONG_S t0, ST_OFF(t2)
+ LONG_S t0, ST_OFF(t3)
/* Enable COP2 so we can save it */
mfc0 t0, CP0_STATUS