 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.418 2020/08/10 05:38:43 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.419 2020/08/10 05:40:21 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
 @@ -182,27 +182,27 @@
 /* Include header files */
 #include "opt_arm_debug.h"
 #include "opt_cpuoptions.h"
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #ifdef MULTIPROCESSOR
 #define _INTR_PRIVATE
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.418 2020/08/10 05:38:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.419 2020/08/10 05:40:21 skrll Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/asan.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/kernhist.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 @@ -4830,26 +4830,28 @@ pmap_unwire(pmap_t pm, vaddr_t va)
 	/* Extract the physical address of the page */
 	pa = l2pte_pa(pte);
 	if ((pg = PHYS_TO_VM_PAGE(pa)) != NULL) {
 		/* Update the wired bit in the pv entry for this page. */
 		struct vm_page_md *md = VM_PAGE_TO_MD(pg);
 		pmap_acquire_page_lock(md);
 		(void) pmap_modify_pv(md, pa, pm, va, PVF_WIRED, 0);
 		pmap_release_page_lock(md);
+	}
 	pmap_release_pmap_lock(pm);
 	UVMHIST_LOG(pmaphist, " <-- done", 0, 0, 0, 0);
+}
 #ifdef ARM_MMU_EXTENDED
 void
 pmap_md_pdetab_activate(pmap_t pm, struct lwp *l)
+{
 	UVMHIST_FUNC(__func__);
 	struct cpu_info * const ci = curcpu();
 	struct pmap_asid_info * const pai = PMAP_PAI(pm, cpu_tlb_info(ci));
 	UVMHIST_CALLARGS(maphist, "pm %#jx (pm->pm_l1_pa %08jx asid %ju)",
 	    (uintptr_t)pm, pm->pm_l1_pa, pai->pai_asid, 0);
 @@ -5165,50 +5167,57 @@ pmap_update(pmap_t pm)
 	PMAPCOUNT(updates);
 	/*
 	 * make sure TLB/cache operations have completed.
 	 */
 	cpu_cpwait();
 	UVMHIST_LOG(maphist, "  <-- done", 0, 0, 0, 0);
+}
 bool
 pmap_remove_all(pmap_t pm)
+{
 	UVMHIST_FUNC(__func__);
 	UVMHIST_CALLARGS(pmaphist, "(pm=%#jx)", (uintptr_t)pmap, 0, 0, 0);
 	KASSERT(pm != pmap_kernel());
 	/*
 	 * The vmspace described by this pmap is about to be torn down.
 	 * Until pmap_update() is called, UVM will only make calls
 	 * to pmap_remove(). We can make life much simpler by flushing
 	 * the cache now, and deferring TLB invalidation to pmap_update().
 	 */
 #ifdef PMAP_CACHE_VIVT
 	pmap_cache_wbinv_all(pm, PVF_EXEC);
 #endif
 #ifdef ARM_MMU_EXTENDED
 #ifdef MULTIPROCESSOR
 	struct cpu_info * const ci = curcpu();
 	// This should be the last CPU with this pmap onproc
 	KASSERT(!kcpuset_isotherset(pm->pm_onproc, cpu_index(ci)));
 	if (kcpuset_isset(pm->pm_onproc, cpu_index(ci)))
 #endif
 		pmap_tlb_asid_deactivate(pm);
 #ifdef MULTIPROCESSOR
 	KASSERT(kcpuset_iszero(pm->pm_onproc));
 #endif
 	pmap_tlb_asid_release_all(pm);
 #endif
 	pm->pm_remove_all = true;
 	UVMHIST_LOG(pmaphist, " <-- done", 0, 0, 0, 0);
 	return false;
+}
 /*
  * Retire the given physical map from service.
  * Should only be called if the map contains no valid mappings.
  */
 void
 pmap_destroy(pmap_t pm)
+{
 	UVMHIST_FUNC(__func__);
 	UVMHIST_CALLARGS(maphist, "pm=%#jx remove_all %jd", (uintptr_t)pm,
 	    pm ? pm->pm_remove_all : 0, 0, 0);