diff options
| author | Benjamin Herrenschmidt | 2016-07-05 07:03:55 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2016-07-13 10:15:38 +0200 |
| commit | 0f2b3442fb850626d50a9d7e533c9f859ef15e6a (patch) | |
| tree | f46719dfa50228c746c90b205470740f13fd17f2 | |
| parent | powerpc/rtas: Don't test for machine type in rtas_initialize() (diff) | |
| download | kernel-qcow2-linux-0f2b3442fb850626d50a9d7e533c9f859ef15e6a.tar.gz kernel-qcow2-linux-0f2b3442fb850626d50a9d7e533c9f859ef15e6a.tar.xz kernel-qcow2-linux-0f2b3442fb850626d50a9d7e533c9f859ef15e6a.zip | |
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 <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |