Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / arch / mips / kernel / traps.c

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 950bde8813fc2fdb4a13946b8c09ad59c8e2cdbb..8bdd6a663c7fe2284b69bfd4627acdd77364ca63 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -867,7 +867,7 @@ static void mt_ase_fp_affinity(void)
                                = current->cpus_allowed;
                        cpus_and(tmask, current->cpus_allowed,
                                mt_fpu_cpumask);
-                       set_cpus_allowed(current, tmask);
+                       set_cpus_allowed_ptr(current, &tmask);
                        set_thread_flag(TIF_FPUBOUND);
                }
        }