 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.c,v 1.291 2021/05/30 19:46:21 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.292 2021/05/30 19:50:23 thorpej Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008, 2020
  * 	The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Andrew Doran and Mindaugas Rasiukevicius,
  * and by Chris G. Demetriou.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -125,27 +125,27 @@
  *	this module may delay invalidate or reduced protection
  *	operations until such time as they are actually
  *	necessary.  This module is given full information as
  *	to which processors are currently using which maps,
  *	and to when physical maps must be made correct.
  */
 #include "opt_lockdebug.h"
 #include "opt_sysv.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.291 2021/05/30 19:46:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.292 2021/05/30 19:50:23 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/buf.h>
 #include <sys/evcnt.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <uvm/uvm.h>
 @@ -1923,29 +1923,26 @@ pmap_remove_all(pmap_t pmap)
+ *
  *	Lower the permission for all mappings to a given page to
  *	the permissions specified.
  */
 void
 pmap_page_protect(struct vm_page *pg, vm_prot_t prot)
+{
 	pv_entry_t pv, nextpv;
 	pt_entry_t opte;
 	kmutex_t *lock;
 	struct pmap_tlb_context tlbctx;
 #ifdef DEBUG
 	paddr_t pa = VM_PAGE_TO_PHYS(pg);
 	if ((pmapdebug & (PDB_FOLLOW|PDB_PROTECT)) ||
 	    (prot == VM_PROT_NONE && (pmapdebug & PDB_REMOVE)))
 		printf("pmap_page_protect(%p, %x)\n", pg, prot);
 #endif
 	pmap_tlb_context_init(&tlbctx, TLB_CTX_F_PV);
 	switch (prot) {
 	case VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE:
 	case VM_PROT_READ|VM_PROT_WRITE:
 		return;
 	/* copy_on_write */
 @@ -2566,27 +2563,27 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
 #ifdef DEBUG
 	if (pmapdebug & PDB_FOLLOW)
 		printf("pmap_extract(%p, %lx) -> ", pmap, va);
 #endif
 	/*
 	 * Take a faster path for the kernel pmap.  Avoids locking,
 	 * handles K0SEG.
 	 */
 	if (__predict_true(pmap == pmap_kernel())) {
 		if (__predict_true(vtophys_internal(va, pap))) {
 #ifdef DEBUG
 			if (pmapdebug & PDB_FOLLOW)
-				printf("0x%lx (kernel vtophys)\n", pa);
+				printf("0x%lx (kernel vtophys)\n", *pap);
 #endif
 			return true;
+		}
 #ifdef DEBUG
 		if (pmapdebug & PDB_FOLLOW)
 			printf("failed (kernel vtophys)\n");
 #endif
 		return false;
+	}
 	pt_entry_t * const lev1map = pmap_lev1map(pmap);
 	PMAP_LOCK(pmap);
 @@ -3268,27 +3265,27 @@ void
 pmap_pv_dump(paddr_t pa)
+{
 	struct vm_page *pg;
 	struct vm_page_md *md;
 	pv_entry_t pv;
 	kmutex_t *lock;
 	pg = PHYS_TO_VM_PAGE(pa);
 	md = VM_PAGE_TO_MD(pg);
 	lock = pmap_pvh_lock(pg);
 	mutex_enter(lock);
-	printf("pa 0x%lx (attrs = 0x%x):\n", pa, md->pvh_listx & PGA_ATTRS);
+	printf("pa 0x%lx (attrs = 0x%lx):\n", pa, md->pvh_listx & PGA_ATTRS);
 	for (pv = VM_MDPAGE_PVS(pg); pv != NULL; pv = pv->pv_next)
 		printf("     pmap %p, va 0x%lx\n",
 		    pv->pv_pmap, pv->pv_va);
 	printf("\n");
 	mutex_exit(lock);
+}
 #endif
 /*
  * vtophys:
+ *
  *	Return the physical address corresponding to the K0SEG or
 @@ -3994,27 +3991,27 @@ pmap_asn_alloc(pmap_t const pmap, struct
 		 * are not currently in use by this processor.
+		 *
 		 * However... considering that we're using an unsigned 64-bit
 		 * integer for generation numbers, on non-ASN CPUs, we won't
 		 * wrap for approximately 75 billion years on a 128-ASN CPU
 		 * (assuming 1000 switch * operations per second).
+		 *
 		 * So, we don't bother.
 		 */
 		KASSERT(ci->ci_asn_gen != PMAP_ASNGEN_INVALID);
 #ifdef DEBUG
 		if (pmapdebug & PDB_ASN)
 			printf("pmap_asn_alloc: generation bumped to %lu\n",
-			    ci->ci_asn_ge);
+			    ci->ci_asn_gen);
 #endif
+	}
 	/*
 	 * Assign the new ASN and validate the generation number.
 	 */
 	pmc->pmc_asn = ci->ci_next_asn++;
 	pmc->pmc_asngen = ci->ci_asn_gen;
 	TLB_COUNT(asn_assign);
 	/*
 	 * We have a new ASN, so we can skip any pending I-stream sync
 	 * on the way back out to user space.