Sat Apr 12 16:04:00 2014 UTC ()

KDASSERT -> KDASSERTMSG


(matt)

diff -r1.286 -r1.287 src/sys/arch/arm/arm32/pmap.c

--- src/sys/arch/arm/arm32/pmap.c 2014/04/12 09:09:47	1.286
+++ src/sys/arch/arm/arm32/pmap.c 2014/04/12 16:03:59	1.287

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.286 2014/04/12 09:09:47 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.287 2014/04/12 16:03:59 matt Exp $	*/
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -206,27 +206,27 @@
 #include <sys/kmem.h>
 #include <sys/cdefs.h>
 #include <sys/cpu.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
 #include <sys/atomic.h>
 #include <sys/kernhist.h>
 #include <uvm/uvm.h>
 #include <arm/locore.h>
 //#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.286 2014/04/12 09:09:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.287 2014/04/12 16:03:59 matt Exp $");
 //#define PMAP_DEBUG
 #ifdef PMAP_DEBUG
 /* XXX need to get rid of all refs to this */
 int pmap_debug_level = 0;
 /*
  * for switching to potentially finer grained debugging
  */
 #define	PDB_FOLLOW	0x0001
 #define	PDB_INIT	0x0002
 #define	PDB_ENTER	0x0004
 @@ -3838,27 +3838,28 @@ pmap_kremove(vaddr_t va, vsize_t len)
 			if (l2pte_valid_p(opte)) {
 #ifdef PMAP_CACHE_VIVT
 				cpu_dcache_wbinv_range(va, PAGE_SIZE);
 #endif
 				cpu_tlb_flushD_SE(va);
+			}
 			if (opte) {
 				l2pte_reset(ptep);
 				mappings += PAGE_SIZE / L2_S_SIZE;
+			}
 			va += PAGE_SIZE;
 			ptep += PAGE_SIZE / L2_S_SIZE;
+		}
-		KDASSERT(mappings <= l2b->l2b_occupancy);
+		KDASSERTMSG(mappings <= l2b->l2b_occupancy, "%u %u",
 		    mappings, l2b->l2b_occupancy);
 		l2b->l2b_occupancy -= mappings;
 		PTE_SYNC_RANGE(sptep, (u_int)(ptep - sptep));
 #ifdef UVMHIST
 		total_mappings += mappings;
 #endif
+	}
 	cpu_cpwait();
 	UVMHIST_LOG(maphist, "  <--- done (%u mappings removed)",
 	    total_mappings, 0, 0, 0);
+}
 bool
 pmap_extract(pmap_t pm, vaddr_t va, paddr_t *pap)