diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-05-15 16:53:07 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-05-17 11:47:01 +0200 |
| commit | a4eeea4e530fee26918529eb1b36ae306095eef5 (patch) | |
| tree | 1262131d9ea966b683563e4ac4d30b7ab43c7739 /arch | |
| parent | ba54229db65b161d46df449638a1a386444681b0 (diff) | |
| download | linux-stable-a4eeea4e530fee26918529eb1b36ae306095eef5.tar.gz linux-stable-a4eeea4e530fee26918529eb1b36ae306095eef5.tar.bz2 linux-stable-a4eeea4e530fee26918529eb1b36ae306095eef5.zip | |
s390/smp: fix cpu re-scan vs. cpu state
The cpu-info array starts with a list of cpus in configured state,
followed by the cpus in standby state. The comparison to decide which
state a cpu has is incorrect, this causes configured cpus appear as
standby cpus. The correct comparison is the index of the new cpu in
the cpu-info array vs. the number of configured cpus.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 8074cb4b7cbf..05674b669001 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -645,7 +645,7 @@ static int __cpuinit __smp_rescan_cpus(struct sclp_cpu_info *info, continue; pcpu = pcpu_devices + cpu; pcpu->address = info->cpu[i].address; - pcpu->state = (cpu >= info->configured) ? + pcpu->state = (i >= info->configured) ? CPU_STATE_STANDBY : CPU_STATE_CONFIGURED; smp_cpu_set_polarization(cpu, POLARIZATION_UNKNOWN); set_cpu_present(cpu, true); |