Skip to content

Commit

Permalink
[PATCH] undo partial cpu_exclusive sched domain disabling
Browse files Browse the repository at this point in the history
The partial disabling of Dinakar's new facility to allow
cpu_exclusive cpusets to define dynamic sched domains
doesn't go far enough.  At the suggestion of Nick Piggin
and Dinakar, let us instead totally disable this facility
for 2.6.13, in order to avoid problems first reported
by John Hawkes (corrupt sched data structures and kernel oops).

This patch removes the partial disabling code in 2.6.13-rc7,
in anticipation of the next patch, which will totally disable
it instead.

Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Paul Jackson authored and Linus Torvalds committed Aug 26, 2005
1 parent 1314234 commit ca2f3da
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions kernel/cpuset.c
Original file line number Diff line number Diff line change
Expand Up @@ -635,25 +635,6 @@ static void update_cpu_domains(struct cpuset *cur)
if (par == NULL || cpus_empty(cur->cpus_allowed))
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
Expand Down

0 comments on commit ca2f3da

Please sign in to comment.