Merge HEAD from ../from-linus

1 files changed, 19 insertions, 0 deletions

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 21a4e3b2cbda..d7f4d0c95737 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -636,6 +636,25 @@ static void update_cpu_domains(struct cpuset *cur)
                 return;
 
         /*
+         * Hack to avoid 2.6.13 partial node dynamic sched domain bug.
+         * Require the 'cpu_exclusive' cpuset to include all (or none)
+         * of the CPUs on each node, or return w/o changing sched domains.
+         * Remove this hack when dynamic sched domains fixed.
+         */
+        {
+                int i, j;
+
+                for_each_cpu_mask(i, cur->cpus_allowed) {
+                        cpumask_t mask = node_to_cpumask(cpu_to_node(i));
+
+                        for_each_cpu_mask(j, mask) {
+                                if (!cpu_isset(j, cur->cpus_allowed))
+                                        return;
+                        }
+                }
+        }
+
+        /*
          * Get all cpus from parent's cpus_allowed not part of exclusive
          * children
          */