summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAleksey Makarov <aleksey.makarov@auriga.com>2015-01-15 14:11:09 +0100
committerRalf Baechle <ralf@linux-mips.org>2015-02-20 15:30:23 +0100
commit69f7cd472493f97976598a8b5b515d9ad4814aa6 (patch)
treedc25d2c527a6f16c1a4a2752195fe40da9ebfd4b /arch
parentMIPS: OCTEON: Use correct instruction to read 64-bit COP0 register (diff)
downloadlinux-69f7cd472493f97976598a8b5b515d9ad4814aa6.tar.xz
linux-69f7cd472493f97976598a8b5b515d9ad4814aa6.zip
MIPS: OCTEON: Delete unused COP2 saving code
Commit 2c952e06e4f5 ("MIPS: Move cop2 save/restore to switch_to()") removes assembler code to store COP2 registers. Commit a36d8225bceb ("MIPS: OCTEON: Enable use of FPU") mistakenly restores it Fixes: a36d8225bceb ("MIPS: OCTEON: Enable use of FPU") Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Cc: David Daney <david.daney@cavium.com> Patchwork: https://patchwork.linux-mips.org/patch/8937/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/octeon_switch.S26
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S
index f0a699d73627..423ae83af1fb 100644
--- a/arch/mips/kernel/octeon_switch.S
+++ b/arch/mips/kernel/octeon_switch.S
@@ -52,32 +52,6 @@
.set pop
1:
- /* check if we need to save COP2 registers */
- 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(t3)
-
- /* Enable COP2 so we can save it */
- mfc0 t0, CP0_STATUS
- or t0, t1
- mtc0 t0, CP0_STATUS
-
- /* Save COP2 */
- daddu a0, THREAD_CP2
- jal octeon_cop2_save
- dsubu a0, THREAD_CP2
-
- /* Disable COP2 now that we are done */
- mfc0 t0, CP0_STATUS
- li t1, ST0_CU2
- xor t0, t1
- mtc0 t0, CP0_STATUS
-
-1:
#if CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0
/* Check if we need to store CVMSEG state */
dmfc0 t0, $11,7 /* CvmMemCtl */