ppc64 iSeries: Define /cpus in iSeries device tree

[linux-block.git] / arch / ppc64 / kernel / iSeries_smp.c

diff --git a/arch/ppc64/kernel/iSeries_smp.c b/arch/ppc64/kernel/iSeries_smp.c
index f74386e31638d38185755bcf9cb3ae6d8b2f725c..f982e5b805f49eb9eb2b293cbcfbfd032798da1b 100644 (file)
--- a/arch/ppc64/kernel/iSeries_smp.c
+++ b/arch/ppc64/kernel/iSeries_smp.c
@@ -82,35 +82,9 @@ static void smp_iSeries_message_pass(int target, int msg)
        }
 }
 
-static int smp_iSeries_numProcs(void)
-{
-       unsigned np, i;
-
-       np = 0;
-        for (i=0; i < NR_CPUS; ++i) {
-                if (paca[i].lppaca.dyn_proc_status < 2) {
-                       cpu_set(i, cpu_possible_map);
-                       cpu_set(i, cpu_present_map);
-                       cpu_set(i, cpu_sibling_map[i]);
-                        ++np;
-                }
-        }
-       return np;
-}
-
 static int smp_iSeries_probe(void)
 {
-       unsigned i;
-       unsigned np = 0;
-
-       for (i=0; i < NR_CPUS; ++i) {
-               if (paca[i].lppaca.dyn_proc_status < 2) {
-                       /*paca[i].active = 1;*/
-                       ++np;
-               }
-       }
-
-       return np;
+       return cpus_weight(cpu_possible_map);
 }
 
 static void smp_iSeries_kick_cpu(int nr)
@@ -144,6 +118,4 @@ static struct smp_ops_t iSeries_smp_ops = {
 void __init smp_init_iSeries(void)
 {
        smp_ops = &iSeries_smp_ops;
-       systemcfg->processorCount       = smp_iSeries_numProcs();
 }
-