summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2015-07-01 09:31:14 +0100
committerSasha Levin <sasha.levin@oracle.com>2016-03-22 11:10:35 -0400
commite652be4b177954875b8d2d842abfda3626cb1d6a (patch)
tree73914735e7c1f86c0a6a6d79b86ff02bd2b685ab
parentc839d6e6b096f1c9f2d9be880aedd796095b7a80 (diff)
downloadlwn-e652be4b177954875b8d2d842abfda3626cb1d6a.tar.gz
lwn-e652be4b177954875b8d2d842abfda3626cb1d6a.zip
Revert "MIPS: Kconfig: Disable SMP/CPS for 64-bit"
[ Upstream commit 1c885357da2d3cf62132e611c0beaf4cdf607dd9 ] This reverts commit 6ca716f2e5571d25a3899c6c5c91ff72ea6d6f5e. SMP/CPS is now supported on 64bit cores. Cc: <stable@vger.kernel.org> # 4.1 Reviewed-by: Paul Burton <paul.burton@imgtec.com> Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/10592/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rw-r--r--arch/mips/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a3b1ffe50aa0..d9f4612df69d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2221,7 +2221,7 @@ config MIPS_CMP
config MIPS_CPS
bool "MIPS Coherent Processing System support"
- depends on SYS_SUPPORTS_MIPS_CPS && !64BIT
+ depends on SYS_SUPPORTS_MIPS_CPS
select MIPS_CM
select MIPS_CPC
select MIPS_CPS_PM if HOTPLUG_CPU