From: David Hildenbrand Date: Wed, 6 May 2015 07:29:53 +0000 (+0200) Subject: s390/sclp: prepare smp_fill_possible_mask for global "struct sclp" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9747bc47b340228a007efcc262c0bc4d2e94116d;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: David Hildenbrand Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index efd2c1968000..a5321d5a0236 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); }