aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Jackson <pj@sgi.com>2005-08-25 15:47:50 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-26 19:38:46 -0400
commitca2f3daf779f5e89d14e9783fcfd7920842df9e9 (patch)
tree07ce4cc60957d842dac1cb3d44dd5441071cf90f
parent13142341ac867bb67e88204cbfcb8d90f9a861b7 (diff)
[PATCH] undo partial cpu_exclusive sched domain disabling
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>
-rw-r--r--kernel/cpuset.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index d7f4d0c95737..21a4e3b2cbda 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -636,25 +636,6 @@ static void update_cpu_domains(struct cpuset *cur)
636 return; 636 return;
637 637
638 /* 638 /*
639 * Hack to avoid 2.6.13 partial node dynamic sched domain bug.
640 * Require the 'cpu_exclusive' cpuset to include all (or none)
641 * of the CPUs on each node, or return w/o changing sched domains.
642 * Remove this hack when dynamic sched domains fixed.
643 */
644 {
645 int i, j;
646
647 for_each_cpu_mask(i, cur->cpus_allowed) {
648 cpumask_t mask = node_to_cpumask(cpu_to_node(i));
649
650 for_each_cpu_mask(j, mask) {
651 if (!cpu_isset(j, cur->cpus_allowed))
652 return;
653 }
654 }
655 }
656
657 /*
658 * Get all cpus from parent's cpus_allowed not part of exclusive 639 * Get all cpus from parent's cpus_allowed not part of exclusive
659 * children 640 * children
660 */ 641 */