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>

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index efd2c1968000afadc669d1f23e740317a5b809be..a5321d5a02368c8d482cbdaeb407e8e2eeecddde 100644 (file)
--- 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);
 }