[src/trunk]: src/sys/arch/arm/arm32 Fix a KASSERT. From/OK'ed by matt@

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

details:   https://anonhg.NetBSD.org/src/rev/e4113f2aaf45
branches:  trunk
changeset: 780149:e4113f2aaf45
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jul 13 06:02:58 2012 +0000

description:
Fix a KASSERT. From/OK'ed by matt@

diffstat:

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

diffs (27 lines):

diff -r 03d50cdb7992 -r e4113f2aaf45 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Fri Jul 13 05:23:29 2012 +0000
+++ b/sys/arch/arm/arm32/pmap.c Fri Jul 13 06:02:58 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.228 2012/01/29 20:16:16 he Exp $    */
+/*     $NetBSD: pmap.c,v 1.229 2012/07/13 06:02:58 skrll Exp $ */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.228 2012/01/29 20:16:16 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.229 2012/07/13 06:02:58 skrll Exp $");
 
 #ifdef PMAP_DEBUG
 
@@ -3046,7 +3046,7 @@
                KASSERT(uvm_page_locked_p(pg));
 #endif
                KASSERT((md->pvh_attrs & PVF_DMOD) == 0 || (md->pvh_attrs & (PVF_DIRTY|PVF_NC)));
-               KASSERT(((md->pvh_attrs & PVF_WRITE) == 0) == (md->urw_mappings + md->krw_mappings == 0));
+               KASSERT(arm_cache_prefer_mask == 0 || ((md->pvh_attrs & PVF_WRITE) == 0) == (md->urw_mappings + md->krw_mappings == 0));
        }
 #endif