As we now have to support both sane_behavior and !sane_behavior, top_cpuset's configured masks need to be initialized accordingly.
Signed-off-by: Li Zefan <[email protected]> --- kernel/cpuset.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 360e547..5c53ba5 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -2113,8 +2113,27 @@ static void cpuset_css_free(struct cgroup_subsys_state *css) kfree(cs); } +void cpuset_bind(struct cgroup_subsys_state *root_css) +{ + mutex_lock(&cpuset_mutex); + mutex_lock(&callback_mutex); + + if (cgroup_sane_behavior(root_css->cgroup)) { + cpumask_copy(top_cpuset.cpus_allowed, cpu_possible_mask); + top_cpuset.mems_allowed = node_possible_map; + } else { + cpumask_copy(top_cpuset.cpus_allowed, + top_cpuset.effective_cpus); + top_cpuset.mems_allowed = top_cpuset.effective_mems; + } + + mutex_unlock(&callback_mutex); + mutex_unlock(&cpuset_mutex); +} + struct cgroup_subsys cpuset_subsys = { .name = "cpuset", + .bind = cpuset_bind, .css_alloc = cpuset_css_alloc, .css_online = cpuset_css_online, .css_offline = cpuset_css_offline, -- 1.8.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
