mips_cps_{core_init,boot_vpes} had 'mips64r2' hardcoded which
prevented them from being run on mips32. Fix that by choosing
cpu type based on CONFIG_64BIT.
Tested on mt7621.
Signed-off-by: Nikolay Martynov <mar.kolya@xxxxxxxxx>
---
arch/mips/kernel/cps-vec.S | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
index 8fd5a27..1254a51 100644
--- a/arch/mips/kernel/cps-vec.S
+++ b/arch/mips/kernel/cps-vec.S
@@ -257,7 +257,11 @@ LEAF(mips_cps_core_init)
has_mt t0, 3f
.set push
+#ifdef CONFIG_64BIT
.set mips64r2
+#else
+ .set mips32r2
+#endif
.set mt
/* Only allow 1 TC per VPE to execute... */
@@ -376,7 +380,11 @@ LEAF(mips_cps_boot_vpes)
nop
.set push
+#ifdef CONFIG_64BIT
.set mips64r2
+#else
+ .set mips32r2
+#endif
.set mt
1: /* Enter VPE configuration state */
--
2.6.3
