From: Benjamin Herrenschmidt Date: Tue, 5 Jul 2016 05:03:55 +0000 (+1000) Subject: powerpc: Don't test for machine type in smp_setup_cpu_maps() X-Git-Tag: v4.8-rc1~85^2~124 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f2b3442fb850626d50a9d7e533c9f859ef15e6a;p=karo-tx-linux.git powerpc: Don't test for machine type in smp_setup_cpu_maps() The subsequent test for RTAS along with the LPAR test are sufficient Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 8ca79b7503d8..2a3564caafd3 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -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;