diff --git a/[refs] b/[refs] index 0f532289cd34..ad75f8a4e0e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01c889cf4f2e16c9a21376f8583f4a2872d7d1da +refs/heads/master: 0772324ae669f787b42fdb9fc5ac2c3d1c0df509 diff --git a/trunk/kernel/cpuset.c b/trunk/kernel/cpuset.c index 854b8bfbc15c..5372b6f5e5b3 100644 --- a/trunk/kernel/cpuset.c +++ b/trunk/kernel/cpuset.c @@ -1967,14 +1967,6 @@ static void remove_tasks_in_empty_cpuset(struct cpuset *cs) { struct cpuset *parent; - /* - * The cgroup's css_sets list is in use if there are tasks - * in the cpuset; the list is empty if there are none; - * the cs->css.refcnt seems always 0. - */ - if (list_empty(&cs->css.cgroup->css_sets)) - return; - /* * Find its next-highest non-empty parent, (top cpuset * has online cpus, so can't be empty).