Module Name: src
Committed By: matt
Date: Wed Aug 13 15:06:28 UTC 2014
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Fix for PR/49061
only kassert in pmap_kenter_pa if PMAP_CACHE_PIVT && !ARM_MMU_EXTENDED
To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.296 src/sys/arch/arm/arm32/pmap.c:1.297
--- src/sys/arch/arm/arm32/pmap.c:1.296 Wed Aug 13 05:56:03 2014
+++ src/sys/arch/arm/arm32/pmap.c Wed Aug 13 15:06:28 2014
@@ -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 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
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);
