[src/trunk]: src/sys/arch/arm/arm32 Use L2_S_CACHE_MASK in places where we re...

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

details:   https://anonhg.NetBSD.org/src/rev/395294e20ff8
branches:  trunk
changeset: 525376:395294e20ff8
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Apr 10 15:44:23 2002 +0000

description:
Use L2_S_CACHE_MASK in places where we revoke cacheability.

diffstat:

 sys/arch/arm/arm32/pmap.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r d488345faf95 -r 395294e20ff8 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Wed Apr 10 15:36:42 2002 +0000
+++ b/sys/arch/arm/arm32/pmap.c Wed Apr 10 15:44:23 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.90 2002/04/10 04:40:58 thorpej Exp $        */
+/*     $NetBSD: pmap.c,v 1.91 2002/04/10 15:44:23 thorpej Exp $        */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -143,7 +143,7 @@
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.90 2002/04/10 04:40:58 thorpej Exp $");        
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.91 2002/04/10 15:44:23 thorpej Exp $");        
 #ifdef PMAP_DEBUG
 #define        PDEBUG(_lev_,_stat_) \
        if (pmap_debug_level >= (_lev_)) \
@@ -1289,7 +1289,7 @@
 
                /* Revoke cacheability and bufferability */
                /* XXX should be done better than this */
-               ptes[arm_btop(va)] &= ~(L2_C | L2_B);
+               ptes[arm_btop(va)] &= ~L2_S_CACHE_MASK;
 
                va += NBPG;
                m = m->pageq.tqe_next;
@@ -1402,7 +1402,7 @@
 
        /* Revoke cacheability and bufferability */
        /* XXX should be done better than this */
-       *pte &= ~(L2_C | L2_B);
+       *pte &= ~L2_S_CACHE_MASK;
 
        /* Wire in this page table */
        pmap_map_in_l1(pmap, PTE_BASE, pmap->pm_pptpt, TRUE);
@@ -2188,7 +2188,7 @@
                        if ((pmap == npv->pv_pmap 
                            || kpmap == npv->pv_pmap) && 
                            (npv->pv_flags & PVF_NC) == 0) {
-                               ptes[arm_btop(npv->pv_va)] &= ~(L2_C | L2_B);
+                               ptes[arm_btop(npv->pv_va)] &= ~L2_S_CACHE_MASK;
                                npv->pv_flags |= PVF_NC;
                                /*
                                 * If this page needs flushing from the