diff options
| author | Paul Burton | 2014-01-15 10:31:56 +0000 |
|---|---|---|
| committer | Ralf Baechle | 2014-03-26 23:09:07 +0100 |
| commit | e56b6aa6da1a77175e003c85cdb554db7154b1c9 (patch) | |
| tree | 2136b12c6b44f79c22e1f2f5f01429070e3cb51d /arch | |
| parent | 7dc2834fd57e12b355ee80ae5edf134af7476a3b (diff) | |
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')
| -rw-r--r-- | arch/mips/Kconfig | 1 | ||||
| -rw-r--r-- | arch/mips/mti-malta/malta-init.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d7543f243a83..38a77e43effb 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -329,6 +329,7 @@ config MIPS_MALTA select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_SUPPORTS_MIPS_CMP + select SYS_SUPPORTS_MIPS_CPS select SYS_SUPPORTS_MULTITHREADING select SYS_SUPPORTS_SMARTMIPS select SYS_SUPPORTS_ZBOOT 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()) |