Module Name: src
Committed By: skrll
Date: Fri Jul 13 06:02:58 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Fix a KASSERT. From/OK'ed by matt@
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 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.228 src/sys/arch/arm/arm32/pmap.c:1.229
--- src/sys/arch/arm/arm32/pmap.c:1.228 Sun Jan 29 20:16:16 2012
+++ src/sys/arch/arm/arm32/pmap.c Fri Jul 13 06:02:58 2012
@@ -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 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_
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
