powerpc: Don't test for machine type in smp_setup_cpu_maps()
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 5 Jul 2016 05:03:55 +0000 (15:03 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 13 Jul 2016 08:15:38 +0000 (18:15 +1000)
The subsequent test for RTAS along with the LPAR test are sufficient

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/setup-common.c

index 8ca79b7503d8a01e83689f562972e9ba05f2d0c9..2a3564caafd36ce73d751666e30262d0b1aa2414 100644 (file)
@@ -494,7 +494,7 @@ void __init smp_setup_cpu_maps(void)
         * On pSeries LPAR, we need to know how many cpus
         * could possibly be added to this partition.
         */
-       if (machine_is(pseries) && firmware_has_feature(FW_FEATURE_LPAR) &&
+       if (firmware_has_feature(FW_FEATURE_LPAR) &&
            (dn = of_find_node_by_path("/rtas"))) {
                int num_addr_cell, num_size_cell, maxcpus;
                const __be32 *ireg;