[src/trunk]: src/sys/arch/arm/arm32 Fix for PR/49061

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

details:   https://anonhg.NetBSD.org/src/rev/7e705352b5ca
branches:  trunk
changeset: 331524:7e705352b5ca
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Aug 13 15:06:28 2014 +0000

description:
Fix for PR/49061
only kassert in pmap_kenter_pa if PMAP_CACHE_PIVT && !ARM_MMU_EXTENDED

diffstat:

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

diffs (28 lines):

diff -r c06bcb536d97 -r 7e705352b5ca sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Wed Aug 13 15:01:32 2014 +0000
+++ b/sys/arch/arm/arm32/pmap.c Wed Aug 13 15:06:28 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.296 2014/08/13 05:56:03 matt Exp $  */
+/*     $NetBSD: pmap.c,v 1.297 2014/08/13 15:06:28 matt Exp $  */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -216,7 +216,7 @@
 #include <arm/locore.h>
 //#include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.296 2014/08/13 05:56:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.297 2014/08/13 15:06:28 matt Exp $");
 
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
@@ -3770,7 +3770,9 @@
                        pool_put(&pmap_pv_pool, pv);
 #endif
        }
+#if defined(PMAP_CACHE_VIPT) && !defined(ARM_MMU_EXTENDED)
        KASSERT(md == NULL || !pmap_page_locked_p(md));
+#endif
        if (pmap_initialized) {
                UVMHIST_LOG(maphist, "  <-- done (ptep %p: %#x -> %#x)",
                    ptep, opte, npte, 0);