1 files changed, 29 insertions, 30 deletions

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 7e9cb5b1b4a7..c598e890a880 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -752,6 +752,33 @@ asmlinkage void do_ri(struct pt_regs *regs)
         force_sig(SIGILL, current);
 }
 
+/*
+ * MIPS MT processors may have fewer FPU contexts than CPU threads. If we've
+ * emulated more than some threshold number of instructions, force migration to
+ * a "CPU" that has FP support.
+ */
+static void mt_ase_fp_affinity(void)
+{
+#ifdef CONFIG_MIPS_MT_FPAFF
+        if (mt_fpemul_threshold > 0 &&
+             ((current->thread.emulated_fp++ > mt_fpemul_threshold))) {
+                /*
+                 * If there's no FPU present, or if the application has already
+                 * restricted the allowed set to exclude any CPUs with FPUs,
+                 * we'll skip the procedure.
+                 */
+                if (cpus_intersects(current->cpus_allowed, mt_fpu_cpumask)) {
+                        cpumask_t tmask;
+
+                        cpus_and(tmask, current->thread.user_cpus_allowed,
+                                 mt_fpu_cpumask);
+                        set_cpus_allowed(current, tmask);
+                        current->thread.mflags |= MF_FPUBOUND;
+                }
+        }
+#endif /* CONFIG_MIPS_MT_FPAFF */
+}
+
 asmlinkage void do_cpu(struct pt_regs *regs)
 {
         unsigned int cpid;
@@ -785,36 +812,8 @@ asmlinkage void do_cpu(struct pt_regs *regs)
                                                 &current->thread.fpu, 0);
                         if (sig)
                                 force_sig(sig, current);
-#ifdef CONFIG_MIPS_MT_FPAFF
-                        else {
-                        /*
-                         * MIPS MT processors may have fewer FPU contexts
-                         * than CPU threads. If we've emulated more than
-                         * some threshold number of instructions, force
-                         * migration to a "CPU" that has FP support.
-                         */
-                         if(mt_fpemul_threshold > 0
-                         && ((current->thread.emulated_fp++
-                            > mt_fpemul_threshold))) {
-                          /*
-                           * If there's no FPU present, or if the
-                           * application has already restricted
-                           * the allowed set to exclude any CPUs
-                           * with FPUs, we'll skip the procedure.
-                           */
-                          if (cpus_intersects(current->cpus_allowed,
-                                                mt_fpu_cpumask)) {
-                            cpumask_t tmask;
-
-                            cpus_and(tmask,
-                                        current->thread.user_cpus_allowed,
-                                        mt_fpu_cpumask);
-                            set_cpus_allowed(current, tmask);
-                            current->thread.mflags |= MF_FPUBOUND;
-                          }
-                         }
-                        }
-#endif /* CONFIG_MIPS_MT_FPAFF */
+                        else
+                                mt_ase_fp_affinity();
                 }
 
                 return;