[src/trunk]: src/sys/arch/powerpc/ibm4xx Rename NOCACHE -> PPC_4XX_NOCACHE to...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c68f531506da
branches:  trunk
changeset: 518251:c68f531506da
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Nov 26 23:26:33 2001 +0000

description:
Rename NOCACHE -> PPC_4XX_NOCACHE to avoid conflict with the namei
flag of the same name.

>From Frank van der Linden <fvdl%wasabisystems.com@localhost>.

diffstat:

 sys/arch/powerpc/ibm4xx/pmap.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r ae279ca31c60 -r c68f531506da sys/arch/powerpc/ibm4xx/pmap.c
--- a/sys/arch/powerpc/ibm4xx/pmap.c    Mon Nov 26 23:24:20 2001 +0000
+++ b/sys/arch/powerpc/ibm4xx/pmap.c    Mon Nov 26 23:26:33 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.7 2001/11/26 23:24:20 thorpej Exp $ */
+/*     $NetBSD: pmap.c,v 1.8 2001/11/26 23:26:33 thorpej Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#undef NOCACHE
+#undef PPC_4XX_NOCACHE
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -747,7 +747,7 @@
 pmap_zero_page(paddr_t pa)
 {
 
-#ifdef NOCACHE
+#ifdef PPC_4XX_NOCACHE
        memset((caddr_t)pa, 0, NBPG);
 #else
        int i;
@@ -886,7 +886,7 @@
        if (flags & PME_NOCACHE)
                /* Must be I/O mapping */
                tte |= TTE_I | TTE_G;
-#ifdef NOCACHE
+#ifdef PPC_4XX_NOCACHE
        tte |= TTE_I;
 #else
        else if (flags & PME_WRITETHROUG)
@@ -1011,7 +1011,7 @@
                if (prot & PME_NOCACHE)
                        /* Must be I/O mapping */
                        tte |= TTE_I | TTE_G;
-#ifdef NOCACHE
+#ifdef PPC_4XX_NOCACHE
                tte |= TTE_I;
 #else
                else if (prot & PME_WRITETHROUG)
@@ -1450,7 +1450,7 @@
                }
        } else {
                /* Create a 16MB writeable mapping. */
-#ifdef NOCACHE
+#ifdef PPC_4XX_NOCACHE
                tte = TTE_PA(va) | TTE_ZONE(ZONE_PRIV) | TTE_SZ_16M | TTE_I | TTE_WR;
 #else
                tte = TTE_PA(va) | TTE_ZONE(ZONE_PRIV) | TTE_SZ_16M | TTE_WR;