diff options
| author | David Hildenbrand <dahi@linux.vnet.ibm.com> | 2015-05-06 09:29:53 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-05-13 09:58:16 +0200 |
| commit | 9747bc47b340228a007efcc262c0bc4d2e94116d (patch) | |
| tree | 2786d3a5929169402418cc5222d9aa31ac3920d5 /arch/s390/kernel | |
| parent | c431761dddff87039edb3300b9b29d1f9e0af2c9 (diff) | |
| download | op-kernel-dev-9747bc47b340228a007efcc262c0bc4d2e94116d.zip op-kernel-dev-9747bc47b340228a007efcc262c0bc4d2e94116d.tar.gz | |
s390/sclp: prepare smp_fill_possible_mask for global "struct sclp"
We need to rename sclp -> sclp_max to prepare for using the global variable
"sclp" for sclp access later in this function.
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/smp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index efd2c19..a5321d5 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -880,12 +880,12 @@ void __noreturn cpu_die(void) void __init smp_fill_possible_mask(void) { - unsigned int possible, sclp, cpu; + unsigned int possible, sclp_max, cpu; - sclp = min(smp_max_threads, sclp_get_mtid_max() + 1); - sclp = sclp_get_max_cpu()*sclp ?: nr_cpu_ids; + sclp_max = min(smp_max_threads, sclp_get_mtid_max() + 1); + sclp_max = sclp_get_max_cpu() * sclp_max ?: nr_cpu_ids; possible = setup_possible_cpus ?: nr_cpu_ids; - possible = min(possible, sclp); + possible = min(possible, sclp_max); for (cpu = 0; cpu < possible && cpu < nr_cpu_ids; cpu++) set_cpu_possible(cpu, true); } |
