summaryrefslogtreecommitdiff
path: root/arch/mips/mti-malta
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2014-01-15 14:31:56 +0400
committerRalf Baechle <ralf@linux-mips.org>2014-03-27 02:09:07 +0400
commite56b6aa6da1a77175e003c85cdb554db7154b1c9 (patch)
tree2136b12c6b44f79c22e1f2f5f01429070e3cb51d /arch/mips/mti-malta
parent7dc2834fd57e12b355ee80ae5edf134af7476a3b (diff)
downloadlinux-e56b6aa6da1a77175e003c85cdb554db7154b1c9.tar.xz
MIPS: Malta: Allow use of MIPS CPS SMP implementation
This patch simply attempts to register the MIPS Coherent Processing System SMP implementation when it is enabled. If registering that fails for some reason (like the Kconfig option being disabled or a lack of hardware support) then we fall back to the same SMP implementations as before. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6365/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mti-malta')
-rw-r--r--arch/mips/mti-malta/malta-init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c
index 1381365b8873..eebb2d1538c6 100644
--- a/arch/mips/mti-malta/malta-init.c
+++ b/arch/mips/mti-malta/malta-init.c
@@ -285,6 +285,8 @@ mips_pci_controller:
mips_cm_probe();
mips_cpc_probe();
+ if (!register_cps_smp_ops())
+ return;
if (!register_cmp_smp_ops())
return;
if (!register_vsmp_smp_ops())