aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/mips-mt-fpaff.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-06-16 12:08:13 -0400
committerJiri Kosina <jkosina@suse.cz>2010-06-16 12:08:13 -0400
commitf1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch)
treec2c130a74be25b0b2dff992e1a195e2728bdaadd /arch/mips/kernel/mips-mt-fpaff.c
parentfd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff)
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
Merge branch 'master' into for-next
Diffstat (limited to 'arch/mips/kernel/mips-mt-fpaff.c')
-rw-r--r--arch/mips/kernel/mips-mt-fpaff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c
index cbc6182b0065..f5981c499109 100644
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
@@ -100,10 +100,10 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
100 if (test_ti_thread_flag(ti, TIF_FPUBOUND) && 100 if (test_ti_thread_flag(ti, TIF_FPUBOUND) &&
101 cpus_intersects(new_mask, mt_fpu_cpumask)) { 101 cpus_intersects(new_mask, mt_fpu_cpumask)) {
102 cpus_and(effective_mask, new_mask, mt_fpu_cpumask); 102 cpus_and(effective_mask, new_mask, mt_fpu_cpumask);
103 retval = set_cpus_allowed(p, effective_mask); 103 retval = set_cpus_allowed_ptr(p, &effective_mask);
104 } else { 104 } else {
105 clear_ti_thread_flag(ti, TIF_FPUBOUND); 105 clear_ti_thread_flag(ti, TIF_FPUBOUND);
106 retval = set_cpus_allowed(p, new_mask); 106 retval = set_cpus_allowed_ptr(p, &new_mask);
107 } 107 }
108 108
109out_unlock: 109out_unlock: