OSDN Git Service

powerpc: Replace cpumask_weight(cpu_possible_mask) with num_possible_cpus()
authorEmil Medve <Emilian.Medve@freescale.com>
Wed, 21 Jan 2015 22:21:14 +0000 (16:21 -0600)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 23 Jan 2015 03:02:51 +0000 (14:02 +1100)
num_possible_cpus() is just a shorthand for it.

Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/cell/smp.c
arch/powerpc/platforms/pseries/hotplug-cpu.c
arch/powerpc/sysdev/mpic.c
arch/powerpc/sysdev/xics/xics-common.c

index c8017a7..b64e7ea 100644 (file)
@@ -106,7 +106,7 @@ static int __init smp_iic_probe(void)
 {
        iic_request_IPIs();
 
-       return cpumask_weight(cpu_possible_mask);
+       return num_possible_cpus();
 }
 
 static void smp_cell_setup_cpu(int cpu)
index f30cf4d..6247544 100644 (file)
@@ -272,7 +272,7 @@ static int pseries_add_processor(struct device_node *np)
                 */
                printk(KERN_ERR "Cannot add cpu %s; this system configuration"
                       " supports %d logical cpus.\n", np->full_name,
-                      cpumask_weight(cpu_possible_mask));
+                      num_possible_cpus());
                goto out_unlock;
        }
 
index c4648ad..bbfbbf2 100644 (file)
@@ -1929,7 +1929,7 @@ int __init smp_mpic_probe(void)
 
        DBG("smp_mpic_probe()...\n");
 
-       nr_cpus = cpumask_weight(cpu_possible_mask);
+       nr_cpus = num_possible_cpus();
 
        DBG("nr_cpus: %d\n", nr_cpus);
 
index 365249c..125743b 100644 (file)
@@ -148,7 +148,7 @@ int __init xics_smp_probe(void)
        /* Register all the IPIs */
        xics_request_ipi();
 
-       return cpumask_weight(cpu_possible_mask);
+       return num_possible_cpus();
 }
 
 #endif /* CONFIG_SMP */