summaryrefslogtreecommitdiffstats
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2015-09-22 14:58:43 -0400
committerRalf Baechle <ralf@linux-mips.org>2015-11-11 02:35:49 -0500
commitecafe3e9b27644b51282b539878b7671ea28ac34 (patch)
tree6b9e8964e2ce68cec24ad70645d7cdce2488f56d /arch/mips/Kconfig
parente81a8c7dabac05d444eda315ff1a747b0fe38396 (diff)
MIPS: Malta: Register UP SMP ops if all else fails
If we fail to register any real SMP implementations, fall back to registering the dummy UP implementation. Otherwise when we build an SMP kernel & run it on a system where the SMP implementations fail to probe (eg. QEMU) the kernel will perform a NULL dereference attempting to call mp_ops->smp_setup() from plat_smp_setup(). Notably this fixes booting kernels with CPS SMP enabled on QEMU, which doesn't currently implement the CM, CPC or GIC. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Cc: Peter Hurley <peter@hurleysoftware.com> Cc: Rob Herring <robh@kernel.org> Cc: linux-kernel@vger.kernel.org Cc: Markos Chandras <markos.chandras@imgtec.com> Patchwork: https://patchwork.linux-mips.org/patch/11223/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r--arch/mips/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 703438a9698e..9322d267e774 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -425,6 +425,7 @@ config MIPS_MALTA
425 select MIPS_L1_CACHE_SHIFT_6 425 select MIPS_L1_CACHE_SHIFT_6
426 select PCI_GT64XXX_PCI0 426 select PCI_GT64XXX_PCI0
427 select MIPS_MSC 427 select MIPS_MSC
428 select SMP_UP if SMP
428 select SWAP_IO_SPACE 429 select SWAP_IO_SPACE
429 select SYS_HAS_CPU_MIPS32_R1 430 select SYS_HAS_CPU_MIPS32_R1
430 select SYS_HAS_CPU_MIPS32_R2 431 select SYS_HAS_CPU_MIPS32_R2