diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-09-19 12:30:55 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-09-19 12:30:55 +0800 |
commit | fe522b1745154e8889a04b87e76d53ccece41d4a (patch) | |
tree | a3936cc8a12b60bcb2f5d7dd73ae48d7dbf55f81 /kernel/cpuset.c | |
parent | 3b5fdc0c9bc5279975f1c775a2d7dd4ccbf2f40f (diff) | |
parent | a8e202812b52b88e2a33d52687b3b0260706231a (diff) |
Merge tag 'v3.18.42' into linux-linaro-lsk-v3.18lsk-v3.18-16.09
This is the 3.18.42 stable release
Diffstat (limited to 'kernel/cpuset.c')
-rw-r--r-- | kernel/cpuset.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 71b52dd957de..56dc7c1b6300 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -2045,6 +2045,20 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css) mutex_unlock(&cpuset_mutex); } +/* + * Make sure the new task conform to the current state of its parent, + * which could have been changed by cpuset just after it inherits the + * state from the parent and before it sits on the cgroup's task list. + */ +void cpuset_fork(struct task_struct *task) +{ + if (task_css_is_root(task, cpuset_cgrp_id)) + return; + + set_cpus_allowed_ptr(task, ¤t->cpus_allowed); + task->mems_allowed = current->mems_allowed; +} + struct cgroup_subsys cpuset_cgrp_subsys = { .css_alloc = cpuset_css_alloc, .css_online = cpuset_css_online, @@ -2054,6 +2068,7 @@ struct cgroup_subsys cpuset_cgrp_subsys = { .cancel_attach = cpuset_cancel_attach, .attach = cpuset_attach, .bind = cpuset_bind, + .fork = cpuset_fork, .legacy_cftypes = files, .early_init = 1, }; |