diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-25 18:45:49 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-25 18:45:49 +0200 |
| commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
| tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /kernel | |
| parent | [IA64] fix allnoconfig build (diff) | |
| parent | [PATCH] cfq-iosched.c: minor fixes (diff) | |
| download | linux-09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0.tar.xz linux-09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0.zip | |
Merge HEAD from ../from-linus
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpuset.c | 19 |
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 */ |