Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4...

[karo-tx-linux.git] / arch / mips / kernel / mips-mt-fpaff.c

diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c
index 362bb3707e62519d070b5cdba6bfaf9abe2a9249..3e4491aa6d6b2425865e1d1a3a909cf05aaa4e28 100644 (file)
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
@@ -114,8 +114,8 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
        /* Compute new global allowed CPU set if necessary */
        ti = task_thread_info(p);
        if (test_ti_thread_flag(ti, TIF_FPUBOUND) &&
-           cpus_intersects(*new_mask, mt_fpu_cpumask)) {
-               cpus_and(*effective_mask, *new_mask, mt_fpu_cpumask);
+           cpumask_intersects(new_mask, &mt_fpu_cpumask)) {
+               cpumask_and(effective_mask, new_mask, &mt_fpu_cpumask);
                retval = set_cpus_allowed_ptr(p, effective_mask);
        } else {
                cpumask_copy(effective_mask, new_mask);