diff options
author | Aleksey Makarov <aleksey.makarov@auriga.com> | 2015-01-15 08:11:09 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-02-20 09:30:23 -0500 |
commit | 69f7cd472493f97976598a8b5b515d9ad4814aa6 (patch) | |
tree | dc25d2c527a6f16c1a4a2752195fe40da9ebfd4b | |
parent | 2d98cae6e35cfda8c008dba9c43c6f78f85e2792 (diff) |
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>
-rw-r--r-- | arch/mips/kernel/octeon_switch.S | 26 |
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 @@ | |||
52 | .set pop | 52 | .set pop |
53 | 1: | 53 | 1: |
54 | 54 | ||
55 | /* check if we need to save COP2 registers */ | ||
56 | LONG_L t0, ST_OFF(t3) | ||
57 | bbit0 t0, 30, 1f | ||
58 | |||
59 | /* Disable COP2 in the stored process state */ | ||
60 | li t1, ST0_CU2 | ||
61 | xor t0, t1 | ||
62 | LONG_S t0, ST_OFF(t3) | ||
63 | |||
64 | /* Enable COP2 so we can save it */ | ||
65 | mfc0 t0, CP0_STATUS | ||
66 | or t0, t1 | ||
67 | mtc0 t0, CP0_STATUS | ||
68 | |||
69 | /* Save COP2 */ | ||
70 | daddu a0, THREAD_CP2 | ||
71 | jal octeon_cop2_save | ||
72 | dsubu a0, THREAD_CP2 | ||
73 | |||
74 | /* Disable COP2 now that we are done */ | ||
75 | mfc0 t0, CP0_STATUS | ||
76 | li t1, ST0_CU2 | ||
77 | xor t0, t1 | ||
78 | mtc0 t0, CP0_STATUS | ||
79 | |||
80 | 1: | ||
81 | #if CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0 | 55 | #if CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0 |
82 | /* Check if we need to store CVMSEG state */ | 56 | /* Check if we need to store CVMSEG state */ |
83 | dmfc0 t0, $11,7 /* CvmMemCtl */ | 57 | dmfc0 t0, $11,7 /* CvmMemCtl */ |