diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-26 22:11:28 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-26 22:11:28 -0400 |
| commit | 60cfff3516580f5c782cef4dc28f2974c4df8ed1 (patch) | |
| tree | 30053bcf09c1b77699281ba3a56d8ffb4144966c /kernel | |
| parent | 89ef1a21a174a4f581a4b6973f9a9f9ee28a9304 (diff) | |
| parent | 212d6d2237f60bc28c1518f8abf9d3ed6c17574a (diff) | |
Auto-update from upstream
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpuset.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index d7f4d0c9573..8ab1b4e518b 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -627,6 +627,14 @@ static int validate_change(const struct cpuset *cur, const struct cpuset *trial) * Call with cpuset_sem held. May nest a call to the * lock_cpu_hotplug()/unlock_cpu_hotplug() pair. */ + +/* + * Hack to avoid 2.6.13 partial node dynamic sched domain bug. + * Disable letting 'cpu_exclusive' cpusets define dynamic sched + * domains, until the sched domain can handle partial nodes. + * Remove this #if hackery when sched domains fixed. + */ +#if 0 static void update_cpu_domains(struct cpuset *cur) { struct cpuset *c, *par = cur->parent; @@ -636,25 +644,6 @@ 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 */ @@ -686,6 +675,11 @@ static void update_cpu_domains(struct cpuset *cur) partition_sched_domains(&pspan, &cspan); unlock_cpu_hotplug(); } +#else +static void update_cpu_domains(struct cpuset *cur) +{ +} +#endif static int update_cpumask(struct cpuset *cs, char *buf) { |