1 files changed, 20 insertions, 1 deletions

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index c66db5e5ab62..199a06e873c6 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -41,6 +41,10 @@
 #include <asm/elf.h>
 #include <asm/isadep.h>
 #include <asm/inst.h>
+#ifdef CONFIG_MIPS_MT_SMTC
+#include <asm/mipsmtregs.h>
+extern void smtc_idle_loop_hook(void);
+#endif /* CONFIG_MIPS_MT_SMTC */
 
 /*
  * The idle thread. There's no useful work to be done, so just try to conserve
@@ -51,9 +55,13 @@ ATTRIB_NORET void cpu_idle(void)
 {
         /* endless idle loop with no priority at all */
         while (1) {
-                while (!need_resched())
+                while (!need_resched()) {
+#ifdef CONFIG_MIPS_MT_SMTC
+                        smtc_idle_loop_hook();
+#endif /* CONFIG_MIPS_MT_SMTC */
                         if (cpu_wait)
                                 (*cpu_wait)();
+                }
                 preempt_enable_no_resched();
                 schedule();
                 preempt_disable();
@@ -177,6 +185,17 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
         childregs->cp0_status &= ~(ST0_CU2|ST0_CU1);
         clear_tsk_thread_flag(p, TIF_USEDFPU);
 
+#ifdef CONFIG_MIPS_MT_FPAFF
+        /*
+         * FPU affinity support is cleaner if we track the
+         * user-visible CPU affinity from the very beginning.
+         * The generic cpus_allowed mask will already have
+         * been copied from the parent before copy_thread
+         * is invoked.
+         */
+        p->thread.user_cpus_allowed = p->cpus_allowed;
+#endif /* CONFIG_MIPS_MT_FPAFF */
+
         if (clone_flags & CLONE_SETTLS)
                 ti->tp_value = regs->regs[7];