From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Jeff Dike <jdike@addtoit.com>, Richard Weinberger <richard@nod.at>
Cc: linux-fbdev@vger.kernel.org, linux-serial@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-mtd@lists.infradead.org,
user-mode-linux-user@lists.sourceforge.net,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 2/8] um: replace CONFIG_8xx by CONFIG_PPC_8xx
Date: Thu, 12 Mar 2015 15:23:44 +0000 [thread overview]
Message-ID: <20150312152344.83BA31A241D@localhost.localdomain> (raw)
Two config options exist to define powerpc MPC8xx:
* CONFIG_PPC_8xx
* CONFIG_8xx
In addition, CONFIG_PPC_8xx also defines CONFIG_CPM1 as
communication co-processor
arch/powerpc/platforms/Kconfig.cputype has contained the following
comment about CONFIG_8xx item for some years:
"# this is temp to handle compat with arch=ppc"
It looks like not many places still have that old CONFIG_8xx used,
so it is likely to be a good time to get rid of it completely ?
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
arch/um/sys-ppc/misc.S | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/um/sys-ppc/misc.S b/arch/um/sys-ppc/misc.S
index 1364b7d..163e0b2 100644
--- a/arch/um/sys-ppc/misc.S
+++ b/arch/um/sys-ppc/misc.S
@@ -18,7 +18,7 @@
#include <asm/processor.h>
#include "ppc_asm.h"
-#if defined(CONFIG_4xx) || defined(CONFIG_8xx)
+#if defined(CONFIG_4xx) || defined(CONFIG_PPC_8xx)
#define CACHE_LINE_SIZE 16
#define LG_CACHE_LINE_SIZE 4
#define MAX_COPY_PREFETCH 1
@@ -26,7 +26,7 @@
#define CACHE_LINE_SIZE 32
#define LG_CACHE_LINE_SIZE 5
#define MAX_COPY_PREFETCH 4
-#endif /* CONFIG_4xx || CONFIG_8xx */
+#endif /* CONFIG_4xx || CONFIG_PPC_8xx */
.text
@@ -38,7 +38,7 @@
_GLOBAL(clear_page)
li r0,4096/CACHE_LINE_SIZE
mtctr r0
-#ifdef CONFIG_8xx
+#ifdef CONFIG_PPC_8xx
li r4, 0
1: stw r4, 0(r3)
stw r4, 4(r3)
@@ -72,7 +72,7 @@ _GLOBAL(copy_page)
addi r4,r4,-4
li r5,4
-#ifndef CONFIG_8xx
+#ifndef CONFIG_PPC_8xx
#if MAX_COPY_PREFETCH > 1
li r0,MAX_COPY_PREFETCH
li r11,4
@@ -84,12 +84,12 @@ _GLOBAL(copy_page)
dcbt r5,r4
li r11,CACHE_LINE_SIZE+4
#endif /* MAX_COPY_PREFETCH */
-#endif /* CONFIG_8xx */
+#endif /* CONFIG_PPC_8xx */
li r0,4096/CACHE_LINE_SIZE
mtctr r0
1:
-#ifndef CONFIG_8xx
+#ifndef CONFIG_PPC_8xx
dcbt r11,r4
dcbz r5,r3
#endif
--
2.1.0
reply other threads:[~2015-03-12 15:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150312152344.83BA31A241D@localhost.localdomain \
--to=christophe.leroy@c-s.fr \
--cc=jdike@addtoit.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=richard@nod.at \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=user-mode-linux-user@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).