 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.328 2015/11/11 17:54:17 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.329 2015/11/13 07:55:18 skrll 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
 @@ -207,27 +207,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 <uvm/pmap/pmap_pvt.h>
 #include <arm/locore.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.328 2015/11/11 17:54:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.329 2015/11/13 07:55:18 skrll 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
 @@ -4999,27 +4999,31 @@ pmap_deactivate(struct lwp *l)
 		curcpu()->ci_lastlwp = NULL;
 	pm->pm_activated = false;
 #endif
 	UVMHIST_LOG(maphist, "  <-- done", 0, 0, 0, 0);
+}
 void
 pmap_update(pmap_t pm)
+{
 	if (pm->pm_remove_all) {
 #ifdef ARM_MMU_EXTENDED
-		KASSERTMSG(curcpu()->ci_pmap_cur != pm || pm->pm_pai[0].pai_asid == curcpu()->ci_pmap_asid_cur, "pmap/asid %p/%#x != %s cur pmap/asid %p/%#x", pm, pm->pm_pai[0].pai_asid, curcpu()->ci_data.cpu_name, curcpu()->ci_pmap_cur, curcpu()->ci_pmap_asid_cur);
+		KASSERTMSG(curcpu()->ci_pmap_cur != pm
 		    || pm->pm_pai[0].pai_asid == curcpu()->ci_pmap_asid_cur,
 		    "pmap/asid %p/%#x != %s cur pmap/asid %p/%#x", pm,
 		    pm->pm_pai[0].pai_asid, curcpu()->ci_data.cpu_name,
 		    curcpu()->ci_pmap_cur, curcpu()->ci_pmap_asid_cur);
 		/*
 		 * Finish up the pmap_remove_all() optimisation by flushing
 		 * all our ASIDs.
 		 */
 		pmap_tlb_asid_release_all(pm);
 #else
 		/*
 		 * Finish up the pmap_remove_all() optimisation by flushing
 		 * the TLB.
 		 */
 		pmap_tlb_flushID(pm);
 #endif
 		pm->pm_remove_all = false;
 @@ -5028,27 +5032,32 @@ pmap_update(pmap_t pm)
 #ifdef ARM_MMU_EXTENDED
 #if defined(MULTIPROCESSOR)
 	armreg_bpiallis_write(0);
 #else
 	armreg_bpiall_write(0);
 #endif
 #if defined(MULTIPROCESSOR) && PMAP_MAX_TLB > 1
 	u_int pending = atomic_swap_uint(&pmap->pm_shootdown_pending, 0);
 	if (pending && pmap_tlb_shootdown_bystanders(pmap)) {
 		PMAP_COUNT(shootdown_ipis);
+	}
 #endif
 	KASSERTMSG(curcpu()->ci_pmap_cur != pm || pm->pm_pai[0].pai_asid == curcpu()->ci_pmap_asid_cur, "pmap/asid %p/%#x != %s cur pmap/asid %p/%#x", pm, pm->pm_pai[0].pai_asid, curcpu()->ci_data.cpu_name, curcpu()->ci_pmap_cur, curcpu()->ci_pmap_asid_cur);
 	KASSERTMSG(curcpu()->ci_pmap_cur != pm
 	    || pm->pm_pai[0].pai_asid == curcpu()->ci_pmap_asid_cur,
 	    "pmap/asid %p/%#x != %s cur pmap/asid %p/%#x", pm,
 	    pm->pm_pai[0].pai_asid, curcpu()->ci_data.cpu_name,
 	    curcpu()->ci_pmap_cur, curcpu()->ci_pmap_asid_cur);
 #else
 	if (pmap_is_current(pm)) {
 		/*
 		 * If we're dealing with a current userland pmap, move its L1
 		 * to the end of the LRU.
 		 */
 		if (pm != pmap_kernel())
 			pmap_use_l1(pm);
 		/*
 		 * We can assume we're done with frobbing the cache/tlb for
 		 * now. Make sure any future pmap ops don't skip cache/tlb
 		 * flushes.