summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-25 12:45:49 -0400
committerLen Brown <len.brown@intel.com>2005-08-25 12:45:49 -0400
commit09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch)
tree29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /kernel
parentd0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff)
parent9c2c38a122cc23d6a09b8004d60a33913683eedf (diff)
Merge HEAD from ../from-linus
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cpuset.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 21a4e3b2cbd..d7f4d0c9573 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
*/