summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2015-07-01 04:13:30 -0400
committerRalf Baechle <ralf@linux-mips.org>2015-07-09 05:14:48 -0400
commit977e043d5ea1270ce985e4c165724ff91dc3c3e2 (patch)
tree720fce4944a70c902cfdcde9a4f50c5f57863bd9 /arch/mips
parent81a02e34ded906357deac7003fbb0d36b6cc503f (diff)
MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2
mips32r2 is a subset of mips64r2, so we replace mips32r2 with mips64r2 in preparation for 64-bit CPS support. Cc: <stable@vger.kernel.org> # 3.16+ Reviewed-by: Paul Burton <paul.burton@imgtec.com> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/10588/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/cps-vec.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
index a4b2d81f45dd..bbbd88e994f0 100644
--- a/arch/mips/kernel/cps-vec.S
+++ b/arch/mips/kernel/cps-vec.S
@@ -229,7 +229,7 @@ LEAF(mips_cps_core_init)
229 nop 229 nop
230 230
231 .set push 231 .set push
232 .set mips32r2 232 .set mips64r2
233 .set mt 233 .set mt
234 234
235 /* Only allow 1 TC per VPE to execute... */ 235 /* Only allow 1 TC per VPE to execute... */
@@ -346,7 +346,7 @@ LEAF(mips_cps_boot_vpes)
346 nop 346 nop
347 347
348 .set push 348 .set push
349 .set mips32r2 349 .set mips64r2
350 .set mt 350 .set mt
351 351
3521: /* Enter VPE configuration state */ 3521: /* Enter VPE configuration state */