Skip to content

Commit

Permalink
[S390] cpu topology: fix cpu_core_map initialization
Browse files Browse the repository at this point in the history
Common code doesn't call arch_update_cpu_topology() anymore on
cpu hotplug. But our architecture backend relied on that in order to
update the cpu_core_map. For machines without cpu topology support
this leads uninitialized cpu_core_maps for later on added cpus.

To solve this just initialize the maps with cpu_possible_map, since
that will be always valid for machines without topology support.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Dec 25, 2008
1 parent 4a6908a commit 5439050
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/s390/kernel/topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ cpumask_t cpu_coregroup_map(unsigned int cpu)

cpus_clear(mask);
if (!machine_has_topology)
return cpu_present_map;
return cpu_possible_map;
spin_lock_irqsave(&topology_lock, flags);
while (core) {
if (cpu_isset(cpu, core->mask)) {
Expand Down Expand Up @@ -168,7 +168,7 @@ static void topology_update_polarization_simple(void)
int cpu;

mutex_lock(&smp_cpu_state_mutex);
for_each_present_cpu(cpu)
for_each_possible_cpu(cpu)
smp_cpu_polarization[cpu] = POLARIZATION_HRZ;
mutex_unlock(&smp_cpu_state_mutex);
}
Expand Down Expand Up @@ -199,7 +199,7 @@ int topology_set_cpu_management(int fc)
rc = ptf(PTF_HORIZONTAL);
if (rc)
return -EBUSY;
for_each_present_cpu(cpu)
for_each_possible_cpu(cpu)
smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;
return rc;
}
Expand All @@ -208,7 +208,7 @@ static void update_cpu_core_map(void)
{
int cpu;

for_each_present_cpu(cpu)
for_each_possible_cpu(cpu)
cpu_core_map[cpu] = cpu_coregroup_map(cpu);
}

Expand Down

0 comments on commit 5439050

Please sign in to comment.