linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
diff for duplicates of <20170829200803.856-1-paul.burton@imgtec.com>

diff --git a/a/1.txt b/N1/1.txt
index 9e78ad5..8b13789 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,45 +1 @@
-From CM 3.5 onwards we might read information that has typically come
-from the CM using registers which mirror that information in the CPC.
-This requires that we include support for the CPC.
 
-Ensure that CONFIG_MIPS_CPC is enabled along with CONFIG_MIPS_CM so that
-we always include that support. Otherwise we fail to link due to the
-missing mips_cpc_base symbol when the topology functions call CPC
-register accessors.
-
-Signed-off-by: Paul Burton <paul.burton@imgtec.com>
-Fixes: 20fb90f7620d ("MIPS: CPS: Cluster support for topology functions")
-Cc: Ralf Baechle <ralf@linux-mips.org>
-Cc: linux-mips@linux-mips.org
----
-
- arch/mips/Kconfig | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 2d1651797651..5284dfc38e78 100644
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -2385,7 +2385,6 @@ config MIPS_CPS
- 	bool "MIPS Coherent Processing System support"
- 	depends on SYS_SUPPORTS_MIPS_CPS
- 	select MIPS_CM
--	select MIPS_CPC
- 	select MIPS_CPS_PM if HOTPLUG_CPU
- 	select SMP
- 	select SYNC_R4K if (CEVT_R4K || CSRC_R4K)
-@@ -2402,11 +2401,11 @@ config MIPS_CPS
- 
- config MIPS_CPS_PM
- 	depends on MIPS_CPS
--	select MIPS_CPC
- 	bool
- 
- config MIPS_CM
- 	bool
-+	select MIPS_CPC
- 
- config MIPS_CPC
- 	bool
--- 
-2.14.1
diff --git a/a/content_digest b/N1/content_digest
index 5b73ffe..c6517c1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,55 +2,10 @@
  "From\0Paul Burton <paul.burton@imgtec.com>\0"
  "Subject\0[PATCH] fixup: MIPS: CPS: Cluster support for topology functions\0"
  "Date\0Tue, 29 Aug 2017 13:08:03 -0700\0"
- "To\0<linux-mips@linux-mips.org>\0"
+ "To\0linux-mips@linux-mips.org\0"
  "Cc\0Paul Burton <paul.burton@imgtec.com>"
  " Ralf Baechle <ralf@linux-mips.org>\0"
  "\00:1\0"
  "b\0"
- "From CM 3.5 onwards we might read information that has typically come\n"
- "from the CM using registers which mirror that information in the CPC.\n"
- "This requires that we include support for the CPC.\n"
- "\n"
- "Ensure that CONFIG_MIPS_CPC is enabled along with CONFIG_MIPS_CM so that\n"
- "we always include that support. Otherwise we fail to link due to the\n"
- "missing mips_cpc_base symbol when the topology functions call CPC\n"
- "register accessors.\n"
- "\n"
- "Signed-off-by: Paul Burton <paul.burton@imgtec.com>\n"
- "Fixes: 20fb90f7620d (\"MIPS: CPS: Cluster support for topology functions\")\n"
- "Cc: Ralf Baechle <ralf@linux-mips.org>\n"
- "Cc: linux-mips@linux-mips.org\n"
- "---\n"
- "\n"
- " arch/mips/Kconfig | 3 +--\n"
- " 1 file changed, 1 insertion(+), 2 deletions(-)\n"
- "\n"
- "diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig\n"
- "index 2d1651797651..5284dfc38e78 100644\n"
- "--- a/arch/mips/Kconfig\n"
- "+++ b/arch/mips/Kconfig\n"
- "@@ -2385,7 +2385,6 @@ config MIPS_CPS\n"
- " \tbool \"MIPS Coherent Processing System support\"\n"
- " \tdepends on SYS_SUPPORTS_MIPS_CPS\n"
- " \tselect MIPS_CM\n"
- "-\tselect MIPS_CPC\n"
- " \tselect MIPS_CPS_PM if HOTPLUG_CPU\n"
- " \tselect SMP\n"
- " \tselect SYNC_R4K if (CEVT_R4K || CSRC_R4K)\n"
- "@@ -2402,11 +2401,11 @@ config MIPS_CPS\n"
- " \n"
- " config MIPS_CPS_PM\n"
- " \tdepends on MIPS_CPS\n"
- "-\tselect MIPS_CPC\n"
- " \tbool\n"
- " \n"
- " config MIPS_CM\n"
- " \tbool\n"
- "+\tselect MIPS_CPC\n"
- " \n"
- " config MIPS_CPC\n"
- " \tbool\n"
- "-- \n"
- 2.14.1
 
-dea243911a75ea6830e133b1f7b1698965a89fa3a0ca707e1644eb7dad536c7f
+7a2630cdfaab4b109eaab2bbc0295b12a9612d9e1b95e72ce7528a8085378f60

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).