aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/kernel/smp-cps.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-16 15:29:36 -0700
committerKevin Hilman <khilman@linaro.org>2015-06-16 15:29:36 -0700
commitb0477f5f8ec85bf8a82f6aa6eee308d72c418032 (patch)
treed520be10a261f418dbf4539f1d2b5d48d74ba0d3 /arch/mips/kernel/smp-cps.c
parent13a29d9ad242f0bf3b31afe812c81558d54892de (diff)
parent9a004a75a3305fbd3c253f38cd0788164c4fbd56 (diff)
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.07-android
Diffstat (limited to 'arch/mips/kernel/smp-cps.c')
-rw-r--r--arch/mips/kernel/smp-cps.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
index e6e16a1d4add..0854f17829f3 100644
--- a/arch/mips/kernel/smp-cps.c
+++ b/arch/mips/kernel/smp-cps.c
@@ -88,6 +88,12 @@ static void __init cps_smp_setup(void)
/* Make core 0 coherent with everything */
write_gcr_cl_coherence(0xff);
+
+#ifdef CONFIG_MIPS_MT_FPAFF
+ /* If we have an FPU, enroll ourselves in the FPU-full mask */
+ if (cpu_has_fpu)
+ cpu_set(0, mt_fpu_cpumask);
+#endif /* CONFIG_MIPS_MT_FPAFF */
}
static void __init cps_prepare_cpus(unsigned int max_cpus)