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>
This commit is contained in:
David Hildenbrand 2015-05-06 09:29:53 +02:00 committed by Martin Schwidefsky
parent c431761ddd
commit 9747bc47b3

View File

@ -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);
}