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.le...@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


------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

Reply via email to