Merge tag 'cpumask-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / mips / kernel / traps.c

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index e334c641a81b3d30bc9a90e2de98604f76993dc4..ba32e48d4697193f3410edd79153d392ab0d8311 100644 (file)
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1153,13 +1153,13 @@ static void mt_ase_fp_affinity(void)
                 * restricted the allowed set to exclude any CPUs with FPUs,
                 * we'll skip the procedure.
                 */
-               if (cpus_intersects(current->cpus_allowed, mt_fpu_cpumask)) {
+               if (cpumask_intersects(&current->cpus_allowed, &mt_fpu_cpumask)) {
                        cpumask_t tmask;
 
                        current->thread.user_cpus_allowed
                                = current->cpus_allowed;
-                       cpus_and(tmask, current->cpus_allowed,
-                               mt_fpu_cpumask);
+                       cpumask_and(&tmask, &current->cpus_allowed,
+                                   &mt_fpu_cpumask);
                        set_cpus_allowed_ptr(current, &tmask);
                        set_thread_flag(TIF_FPUBOUND);
                }