Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
arch
/
mips
/
kernel
/
mips-mt-fpaff.c
diff --git
a/kernel/arch/mips/kernel/mips-mt-fpaff.c
b/kernel/arch/mips/kernel/mips-mt-fpaff.c
index
3e4491a
..
789d7bf
100644
(file)
--- a/
kernel/arch/mips/kernel/mips-mt-fpaff.c
+++ b/
kernel/arch/mips/kernel/mips-mt-fpaff.c
@@
-154,7
+154,7
@@
asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
unsigned long __user *user_mask_ptr)
{
unsigned int real_len;
unsigned long __user *user_mask_ptr)
{
unsigned int real_len;
- cpumask_t mask;
+ cpumask_t
allowed,
mask;
int retval;
struct task_struct *p;
int retval;
struct task_struct *p;
@@
-173,7
+173,8
@@
asmlinkage long mipsmt_sys_sched_getaffinity(pid_t pid, unsigned int len,
if (retval)
goto out_unlock;
if (retval)
goto out_unlock;
- cpumask_and(&mask, &p->thread.user_cpus_allowed, cpu_possible_mask);
+ cpumask_or(&allowed, &p->thread.user_cpus_allowed, &p->cpus_allowed);
+ cpumask_and(&mask, &allowed, cpu_active_mask);
out_unlock:
read_unlock(&tasklist_lock);
out_unlock:
read_unlock(&tasklist_lock);