lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] cpu topology: fix cpu_core_map initialization

Browse Source 
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>
This commit is contained in:
Heiko Carstens
2008-12-25 13:37:57 +01:00
committed by Martin Schwidefsky
parent 4a6908a3a0
commit 5439050f9f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/s390/kernel/topology.c
View File

@@ -78,7 +78,7 @@ cpumask_t cpu_coregroup_map(unsigned int cpu)
cpus_clear(mask); cpus_clear(mask);
if (!machine_has_topology) if (!machine_has_topology)
return cpu_present_map; return cpu_possible_map;
spin_lock_irqsave(&topology_lock, flags); spin_lock_irqsave(&topology_lock, flags);
while (core) { while (core) {
if (cpu_isset(cpu, core->mask)) { if (cpu_isset(cpu, core->mask)) {
@@ -168,7 +168,7 @@ static void topology_update_polarization_simple(void)
int cpu; int cpu;
mutex_lock(&smp_cpu_state_mutex); mutex_lock(&smp_cpu_state_mutex);
for_each_present_cpu(cpu) for_each_possible_cpu(cpu)
smp_cpu_polarization[cpu] = POLARIZATION_HRZ; smp_cpu_polarization[cpu] = POLARIZATION_HRZ;
mutex_unlock(&smp_cpu_state_mutex); mutex_unlock(&smp_cpu_state_mutex);
} }
@@ -199,7 +199,7 @@ int topology_set_cpu_management(int fc)
rc = ptf(PTF_HORIZONTAL); rc = ptf(PTF_HORIZONTAL);
if (rc) if (rc)
return -EBUSY; return -EBUSY;
for_each_present_cpu(cpu) for_each_possible_cpu(cpu)
smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN; smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;
return rc; return rc;
} }
@@ -208,7 +208,7 @@ static void update_cpu_core_map(void)
{ {
int cpu; int cpu;
for_each_present_cpu(cpu) for_each_possible_cpu(cpu)
cpu_core_map[cpu] = cpu_coregroup_map(cpu); cpu_core_map[cpu] = cpu_coregroup_map(cpu);
} }