Commit d6f0f257 authored by Linus Torvalds's avatar Linus Torvalds

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
parent cb746226
...@@ -221,23 +221,6 @@ void __devinit arch_init_sched_domains(void) ...@@ -221,23 +221,6 @@ void __devinit arch_init_sched_domains(void)
&cpu_to_phys_group); &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 #ifdef CONFIG_NUMA
init_sched_build_groups(sched_group_allnodes, cpu_default_map, init_sched_build_groups(sched_group_allnodes, cpu_default_map,
&cpu_to_allnodes_group); &cpu_to_allnodes_group);
......
...@@ -4361,23 +4361,6 @@ static void __devinit arch_init_sched_domains(void) ...@@ -4361,23 +4361,6 @@ static void __devinit arch_init_sched_domains(void)
&cpu_to_phys_group); &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 #ifdef CONFIG_NUMA
/* Set up node groups */ /* Set up node groups */
init_sched_build_groups(sched_group_nodes, cpu_default_map, init_sched_build_groups(sched_group_nodes, cpu_default_map,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment