 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap_tlb.c,v 1.51 2022/01/02 16:03:30 christos Exp $	*/
+/*	$NetBSD: pmap_tlb.c,v 1.52 2022/03/04 08:11:48 skrll Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas at 3am Software Foundry.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.51 2022/01/02 16:03:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.52 2022/03/04 08:11:48 skrll Exp $");
 /*
  * Manages address spaces in a TLB.
+ *
  * Normally there is a 1:1 mapping between a TLB and a CPU.  However, some
  * implementations may share a TLB between multiple CPUs (really CPU thread
  * contexts).  This requires the TLB abstraction to be separated from the
  * CPU abstraction.  It also requires that the TLB be locked while doing
  * TLB activities.
+ *
  * For each TLB, we track the ASIDs in use in a bitmap and a list of pmaps
  * that have a valid ASID.
+ *
 @@ -537,29 +537,26 @@ pmap_tlb_asid_reinitialize(struct pmap_t
 #endif
 	UVMHIST_LOG(maphist, " <-- done", 0, 0, 0, 0);
+}
 #if defined(MULTIPROCESSOR) && defined(PMAP_TLB_NEED_SHOOTDOWN)
 #if PMAP_TLB_MAX == 1
 #error shootdown not required for single TLB systems
 #endif
 void
 pmap_tlb_shootdown_process(void)
+{
 	struct cpu_info * const ci = curcpu();
 	struct pmap_tlb_info * const ti = cpu_tlb_info(ci);
 #ifdef DIAGNOSTIC
 	struct pmap * const pm = curlwp->l_proc->p_vmspace->vm_map.pmap;
 #endif
 	KASSERT(cpu_intr_p());
 	KASSERTMSG(ci->ci_cpl >= IPL_SCHED, "%s: cpl (%d) < IPL_SCHED (%d)",
 	    __func__, ci->ci_cpl, IPL_SCHED);
 	TLBINFO_LOCK(ti);
 	switch (ti->ti_tlbinvop) {
 	case TLBINV_ONE: {
 		/*
 		 * We only need to invalidate one user ASID.
 		 */
 		struct pmap_asid_info * const pai = PMAP_PAI(ti->ti_victim, ti);
 @@ -570,27 +567,26 @@ pmap_tlb_shootdown_process(void)
 			 * invalidate its TLB entries.
 			 */
 			KASSERT(pai->pai_asid > KERNEL_PID);
 			pmap_tlb_asid_check();
 			tlb_invalidate_asids(pai->pai_asid, pai->pai_asid);
 			pmap_tlb_asid_check();
 		} else if (pai->pai_asid) {
 			/*
 			 * The victim is no longer an active pmap for this TLB.
 			 * So simply clear its ASID and when pmap_activate is
 			 * next called for this pmap, it will allocate a new
 			 * ASID.
 			 */
 			KASSERT(!pmap_tlb_intersecting_onproc_p(pm, ti));
 			pmap_tlb_pai_reset(ti, pai, PAI_PMAP(pai, ti));
+		}
 		break;
+	}
 	case TLBINV_ALLUSER:
 		/*
 		 * Flush all user TLB entries.
 		 */
 		pmap_tlb_asid_reinitialize(ti, TLBINV_ALLUSER);
 		break;
 	case TLBINV_ALLKERNEL:
 		/*
 		 * We need to invalidate all global TLB entries.