 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.319 2015/04/11 15:21:33 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.320 2015/04/13 16:19:42 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/pool.h>
 #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>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.319 2015/04/11 15:21:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.320 2015/04/13 16:19:42 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
 @@ -3661,26 +3661,27 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
 #endif
 #endif
 	struct vm_page_md *md = pg != NULL ? VM_PAGE_TO_MD(pg) : NULL;
 	UVMHIST_FUNC(__func__);
 	if (pmap_initialized) {
 		UVMHIST_CALLED(maphist);
 		UVMHIST_LOG(maphist, " (va=%#x, pa=%#x, prot=%#x, flags=%#x",
 		    va, pa, prot, flags);
+	}
 	pmap_t kpm = pmap_kernel();
 	pmap_acquire_pmap_lock(kpm);
 	struct l2_bucket * const l2b = pmap_get_l2_bucket(kpm, va);
 	const size_t l1slot __diagused = l1pte_index(va);
 	KASSERTMSG(l2b != NULL,
 	    "va %#lx pa %#lx prot %d maxkvaddr %#lx: l2 %p l2b %p kva %p",
 	    va, pa, prot, pmap_curmaxkvaddr, kpm->pm_l2[L2_IDX(l1slot)],
 	    kpm->pm_l2[L2_IDX(l1slot)]
 		? &kpm->pm_l2[L2_IDX(l1slot)]->l2_bucket[L2_BUCKET(l1slot)]
 		: NULL,
 	    kpm->pm_l2[L2_IDX(l1slot)]
 		? kpm->pm_l2[L2_IDX(l1slot)]->l2_bucket[L2_BUCKET(l1slot)].l2b_kva
 		: NULL);
 	KASSERT(l2b->l2b_kva != NULL);
 @@ -3708,26 +3709,27 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
 #endif
+		}
 #endif
 		if (l2pte_valid_p(opte)) {
 			l2pte_reset(ptep);
 			PTE_SYNC(ptep);
 #ifdef PMAP_CACHE_VIVT
 			cpu_dcache_wbinv_range(va, PAGE_SIZE);
 #endif
 			cpu_tlb_flushD_SE(va);
 			cpu_cpwait();
+		}
+	}
 	pmap_release_pmap_lock(kpm);
 	pt_entry_t npte = L2_S_PROTO | pa | L2_S_PROT(PTE_KERNEL, prot)
 	    | ((flags & PMAP_NOCACHE)
 		? 0
 		: ((flags & PMAP_PTE)
 		    ? pte_l2_s_cache_mode_pt : pte_l2_s_cache_mode));
 #ifdef ARM_MMU_EXTENDED
 	if (prot & VM_PROT_EXECUTE)
 		npte &= ~L2_XS_XN;
 #endif
 	l2pte_set(ptep, npte, 0);
 	PTE_SYNC(ptep);
 @@ -3804,26 +3806,28 @@ pmap_kremove(vaddr_t va, vsize_t len)
+{
 #ifdef UVMHIST
 	u_int total_mappings = 0;
 #endif
 	PMAPCOUNT(kenter_unmappings);
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
 	UVMHIST_LOG(maphist, " (va=%#x, len=%#x)", va, len, 0, 0);
 	const vaddr_t eva = va + len;
 	pmap_acquire_pmap_lock(pmap_kernel());
 	while (va < eva) {
 		vaddr_t next_bucket = L2_NEXT_BUCKET_VA(va);
 		if (next_bucket > eva)
 			next_bucket = eva;
 		pmap_t kpm = pmap_kernel();
 		struct l2_bucket * const l2b = pmap_get_l2_bucket(kpm, va);
 		KDASSERT(l2b != NULL);
 		pt_entry_t * const sptep = &l2b->l2b_kva[l2pte_index(va)];
 		pt_entry_t *ptep = sptep;
 		u_int mappings = 0;
 @@ -3865,26 +3869,27 @@ pmap_kremove(vaddr_t va, vsize_t len)
 				mappings += PAGE_SIZE / L2_S_SIZE;
+			}
 			va += PAGE_SIZE;
 			ptep += PAGE_SIZE / L2_S_SIZE;
+		}
 		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
+	}
 	pmap_release_pmap_lock(pmap_kernel());
 	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)
+{
 	struct l2_dtable *l2;
 	pd_entry_t *pdep, pde;
 	pt_entry_t *ptep, pte;
 	paddr_t pa;
 	u_int l1slot;