Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / kernel / cgroup / cpuset.c

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 39ca7e976fbbf4b1e5175401f10dbc7ac67a9217..2f4039bafebb8300afc905d7a8a08f48a93612a6 100644 (file)
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -2351,13 +2351,7 @@ void cpuset_update_active_cpus(void)
         * We're inside cpu hotplug critical region which usually nests
         * inside cgroup synchronization.  Bounce actual hotplug processing
         * to a work item to avoid reverse locking order.
-        *
-        * We still need to do partition_sched_domains() synchronously;
-        * otherwise, the scheduler will get confused and put tasks to the
-        * dead CPU.  Fall back to the default single domain.
-        * cpuset_hotplug_workfn() will rebuild it as necessary.
         */
-       partition_sched_domains(1, NULL, NULL);
        schedule_work(&cpuset_hotplug_work);
 }