diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-07 15:38:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-07 15:38:59 -0800 |
| commit | d6f0f257cd8f5bf3dd307637d0ebf21298aa5d54 (patch) | |
| tree | dd8713781482aa1656f831c6046abb8d679bd6d2 | |
| parent | cb746226b7f8fd8e5a163108e65ef17e263be336 (diff) | |
Revert isolcpus option fix, pending better fix from Nick.
The real bug was in the debugging code, not the actual domain data
structure setup.
Cset exclude: sivanich@sgi.com[torvalds]|ChangeSet|20041207160443|30564
| -rw-r--r-- | arch/ia64/kernel/domain.c | 17 | ||||
| -rw-r--r-- | kernel/sched.c | 17 |
2 files changed, 0 insertions, 34 deletions
diff --git a/arch/ia64/kernel/domain.c b/arch/ia64/kernel/domain.c index f1cb5bef8e2e..c655353941bf 100644 --- a/arch/ia64/kernel/domain.c +++ b/arch/ia64/kernel/domain.c @@ -221,23 +221,6 @@ void __devinit arch_init_sched_domains(void) &cpu_to_phys_group); } - /* Initialize isolated CPU (physical) domains and groups */ - for_each_cpu_mask(i, cpu_isolated_map) { - struct sched_domain *sd; - int group; - - sd = &per_cpu(phys_domains, i); - group = cpu_to_phys_group(i); - *sd = SD_CPU_INIT; - cpu_set(i, sd->span); - sd->flags = 0; - sd->balance_interval = INT_MAX; - sd->groups = &sched_group_phys[group]; - init_sched_build_groups(sched_group_phys, sd->span, - &cpu_to_phys_group); - sd->groups->cpu_power = SCHED_LOAD_SCALE; - } - #ifdef CONFIG_NUMA init_sched_build_groups(sched_group_allnodes, cpu_default_map, &cpu_to_allnodes_group); diff --git a/kernel/sched.c b/kernel/sched.c index 45ee3fa77467..c096b7be2808 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -4361,23 +4361,6 @@ static void __devinit arch_init_sched_domains(void) &cpu_to_phys_group); } - /* Initialize isolated CPU (physical) domains and groups */ - for_each_cpu_mask(i, cpu_isolated_map) { - struct sched_domain *sd; - int group; - - sd = &per_cpu(phys_domains, i); - group = cpu_to_phys_group(i); - *sd = SD_CPU_INIT; - cpu_set(i, sd->span); - sd->flags = 0; - sd->balance_interval = INT_MAX; - sd->groups = &sched_group_phys[group]; - init_sched_build_groups(sched_group_phys, sd->span, - &cpu_to_phys_group); - sd->groups->cpu_power = SCHED_LOAD_SCALE; - } - #ifdef CONFIG_NUMA /* Set up node groups */ init_sched_build_groups(sched_group_nodes, cpu_default_map, |