Module Name: src
Committed By: matt
Date: Mon Jul 9 11:19:34 UTC 2012
Modified Files:
src/sys/uvm: uvm_km.c
Log Message:
Convert a KASSERT to a KASSERTMSG. Expand one KASSERTSG a little bit.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/uvm/uvm_km.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/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.127 src/sys/uvm/uvm_km.c:1.128
--- src/sys/uvm/uvm_km.c:1.127 Sun Jun 3 17:12:49 2012
+++ src/sys/uvm/uvm_km.c Mon Jul 9 11:19:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.127 2012/06/03 17:12:49 rmind Exp $ */
+/* $NetBSD: uvm_km.c,v 1.128 2012/07/09 11:19:34 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.127 2012/06/03 17:12:49 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.128 2012/07/09 11:19:34 matt Exp $");
#include "opt_uvmhist.h"
@@ -500,7 +500,10 @@ uvm_km_pgremove_intrsafe(struct vm_map *
UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
KASSERT(VM_MAP_IS_KERNEL(map));
- KASSERT(vm_map_min(map) <= start);
+ KASSERTMSG(vm_map_min(map) <= start,
+ "vm_map_min(map) [%#"PRIxVADDR"] <= start [%#"PRIxVADDR"]"
+ " (size=%#"PRIxVSIZE")",
+ vm_map_min(map), start, end - start);
KASSERT(start < end);
KASSERT(end <= vm_map_max(map));
@@ -781,9 +784,13 @@ again:
loopsize = size;
while (loopsize) {
- KASSERTMSG(!pmap_extract(pmap_kernel(), loopva, NULL),
- "loopva=%#"PRIxVADDR" loopsize=%#"PRIxVSIZE" vmem=%p",
- loopva, loopsize, vm);
+#ifdef DIAGNOSTIC
+ paddr_t pa;
+#endif
+ KASSERTMSG(!pmap_extract(pmap_kernel(), loopva, &pa),
+ "loopva=%#"PRIxVADDR" loopsize=%#"PRIxVSIZE
+ " pa=%#"PRIxPADDR" vmem=%p",
+ loopva, loopsize, pa, vm);
pg = uvm_pagealloc(NULL, loopva, NULL,
UVM_FLAG_COLORMATCH
