[src/trunk]: src/sys/arch/arm/arm32 Only track kenter_pa'ed pages if arm_cach...

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

details:   https://anonhg.NetBSD.org/src/rev/0f3dda0ba16f
branches:  trunk
changeset: 327071:0f3dda0ba16f
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Feb 26 19:59:49 2014 +0000

description:
Only track kenter_pa'ed pages if arm_cache_prefer_mask is non-zero.

diffstat:

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

diffs (45 lines):

diff -r 588875d3ae74 -r 0f3dda0ba16f sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Wed Feb 26 19:41:46 2014 +0000
+++ b/sys/arch/arm/arm32/pmap.c Wed Feb 26 19:59:49 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.268 2014/02/26 17:35:21 matt Exp $  */
+/*     $NetBSD: pmap.c,v 1.269 2014/02/26 19:59:49 matt Exp $  */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -209,7 +209,7 @@
 #include <arm/locore.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.268 2014/02/26 17:35:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.269 2014/02/26 19:59:49 matt Exp $");
 
 #ifdef PMAP_DEBUG
 
@@ -3346,7 +3346,7 @@
 #ifdef DIAGNOSTIC
                struct vm_page_md *omd = VM_PAGE_TO_MD(opg);
 #endif
-               if (opg) {
+               if (opg && arm_cache_prefer_mask != 0) {
                        KASSERT(opg != pg);
                        KASSERT((omd->pvh_attrs & PVF_KMPAGE) == 0);
                        KASSERT((flags & PMAP_KMPAGE) == 0);
@@ -3406,7 +3406,7 @@
 #endif
                        pmap_kmpages++;
 #ifdef PMAP_CACHE_VIPT
-               } else {
+               } else if (arm_cache_prefer_mask != 0) {
                        if (pv == NULL) {
                                pv = pool_get(&pmap_pv_pool, PR_NOWAIT);
                                KASSERT(pv != NULL);
@@ -3473,7 +3473,7 @@
 #endif
                                        pmap_kmpages--;
 #ifdef PMAP_CACHE_VIPT
-                               } else {
+                               } else if (arm_cache_prefer_mask != 0) {
                                        pool_put(&pmap_pv_pool,
                                            pmap_kremove_pg(opg, va));
 #endif