CVS commit: src/sys/arch

Sat, 18 Apr 2020 04:01:14 -0700 

Module Name:    src
Committed By:   skrll
Date:           Sat Apr 18 11:00:42 UTC 2020

Modified Files:
        src/sys/arch/aarch64/aarch64: pmap.c
        src/sys/arch/aarch64/conf: files.aarch64
        src/sys/arch/acorn32/acorn32: rpc_machdep.c
        src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC
        src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
        src/sys/arch/arm/arm32: arm32_machdep.c vm_machdep.c
        src/sys/arch/arm/at91: at91bus.c
        src/sys/arch/arm/conf: files.arm
        src/sys/arch/arm/include/arm32: pmap.h
        src/sys/arch/cats/cats: cats_machdep.c
        src/sys/arch/cats/conf: GENERIC INSTALL
        src/sys/arch/evbarm/adi_brh: brh_machdep.c
        src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
        src/sys/arch/evbarm/conf: ADI_BRH ARMADAXP ARMADILLO-IOT-G3
            ARMADILLO210 ARMADILLO9 BCM5301X BCM56340 CP3100 CUBOX CUBOX-I
            DNS323 DUOVERO GEMINI GEMINI_MASTER GEMINI_SLAVE GENERIC
            GENERIC.common GENERIC64 GUMSTIX HDL_G HPT5325 HUMMINGBOARD IMX
            IMX31LITE IMX6UL-STARTER INTEGRATOR INTEGRATOR_CP IQ31244 IQ80310
            IQ80321 IXDP425 IXM1200 IYONIX KOBO KUROBOX_PRO KURONAS_X4 LUBBOCK
            MARVELL_NAS MINI2440 N900 NAPPI NETWALKER NSLU2 OMAP5EVM
            OPENBLOCKS_A6 OPENBLOCKS_AX3 OSK5912 PANDABOARD PARALLELLA PEPPER
            RPI SHEEVAPLUG SMDK2410 SMDK2800 TEAMASA_NPWR TEAMASA_NPWR_FC
            TISDP2420 TISDP2430 TS7200 TWINTAIL VIPER VIRT VTC100 ZAO425
            ZEDBOARD
        src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
        src/sys/arch/evbarm/gumstix: gumstix_machdep.c
        src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
        src/sys/arch/evbarm/imx31: imx31lk_machdep.c
        src/sys/arch/evbarm/integrator: integrator_machdep.c
        src/sys/arch/evbarm/iq80310: iq80310_machdep.c
        src/sys/arch/evbarm/iq80321: iq80321_machdep.c
        src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c
        src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c
        src/sys/arch/evbarm/iyonix: iyonix_machdep.c
        src/sys/arch/evbarm/lubbock: lubbock_machdep.c
        src/sys/arch/evbarm/mini2440: mini2440_machdep.c
        src/sys/arch/evbarm/mmnet: mmnet_machdep.c
        src/sys/arch/evbarm/mpcsa: mpcsa_machdep.c
        src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
        src/sys/arch/evbarm/nslu2: nslu2_machdep.c
        src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c
        src/sys/arch/evbarm/tsarm: tsarm_machdep.c
        src/sys/arch/evbarm/viper: viper_machdep.c
        src/sys/arch/hpcarm/conf: IPAQ JORNADA720 JORNADA820 NETBOOKPRO WZERO3
        src/sys/arch/hpcarm/hpcarm: pxa2x0_hpc_machdep.c sa11x0_hpc_machdep.c
        src/sys/arch/iyonix/conf: GENERIC
        src/sys/arch/iyonix/iyonix: iyonix_machdep.c
        src/sys/arch/netwinder/conf: GENERIC
        src/sys/arch/netwinder/netwinder: netwinder_machdep.c
        src/sys/arch/shark/conf: GENERIC INSTALL
        src/sys/arch/zaurus/zaurus: machdep.c

Log Message:
PMAP_DEBUG has been deleted on arm


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/aarch64/conf/files.aarch64
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/acorn32/conf/INSTALL
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/acorn32/conf/NC
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/arm/arm32/vm_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.166 -r1.167 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/cats/cats/cats_machdep.c
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbarm/conf/ADI_BRH \
    src/sys/arch/evbarm/conf/SMDK2410
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/ARMADAXP
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 \
    src/sys/arch/evbarm/conf/VTC100
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/ARMADILLO210
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/conf/ARMADILLO9 \
    src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/BCM5301X \
    src/sys/arch/evbarm/conf/IMX31LITE
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/BCM56340
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/evbarm/conf/CP3100
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/CUBOX \
    src/sys/arch/evbarm/conf/DUOVERO src/sys/arch/evbarm/conf/OMAP5EVM
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/DNS323
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/GEMINI \
    src/sys/arch/evbarm/conf/GEMINI_SLAVE \
    src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/GEMINI_MASTER \
    src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/evbarm/conf/GENERIC \
    src/sys/arch/evbarm/conf/IQ31244
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/conf/HDL_G \
    src/sys/arch/evbarm/conf/NAPPI
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/HUMMINGBOARD \
    src/sys/arch/evbarm/conf/VIRT
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/IMX \
    src/sys/arch/evbarm/conf/KURONAS_X4
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/IMX6UL-STARTER
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/evbarm/conf/INTEGRATOR
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/INTEGRATOR_CP \
    src/sys/arch/evbarm/conf/PEPPER
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/evbarm/conf/IQ80310
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/evbarm/conf/IQ80321 \
    src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/conf/IXDP425
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/IXM1200
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/IYONIX
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/KOBO
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/KUROBOX_PRO
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/N900 \
    src/sys/arch/evbarm/conf/OSK5912
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/NETWALKER \
    src/sys/arch/evbarm/conf/TISDP2430
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/NSLU2
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 \
    src/sys/arch/evbarm/conf/PANDABOARD
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/PARALLELLA
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbarm/conf/SHEEVAPLUG \
    src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/conf/SMDK2800
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/conf/TEAMASA_NPWR
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/TISDP2420
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/evbarm/conf/TS7200
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/VIPER
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/ZEDBOARD
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.78 -r1.79 \
    src/sys/arch/evbarm/integrator/integrator_machdep.c
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/mmnet/mmnet_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/hpcarm/conf/IPAQ
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/hpcarm/conf/JORNADA720
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hpcarm/conf/JORNADA820
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hpcarm/conf/NETBOOKPRO
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/hpcarm/conf/WZERO3
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/iyonix/iyonix/iyonix_machdep.c
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.89 -r1.90 \
    src/sys/arch/netwinder/netwinder/netwinder_machdep.c
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/shark/conf/INSTALL
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/zaurus/zaurus/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.70 src/sys/arch/aarch64/aarch64/pmap.c:1.71
--- src/sys/arch/aarch64/aarch64/pmap.c:1.70	Mon Apr 13 05:40:25 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.70 2020/04/13 05:40:25 maxv Exp $	*/
+/*	$NetBSD: pmap.c,v 1.71 2020/04/18 11:00:37 skrll Exp $	*/
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.70 2020/04/13 05:40:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.71 2020/04/18 11:00:37 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
@@ -56,7 +56,6 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.7
 #include <ddb/db_access.h>
 #endif
 
-//#define PMAP_DEBUG
 //#define PMAP_PV_DEBUG
 
 #ifdef VERBOSE_INIT_ARM

Index: src/sys/arch/aarch64/conf/files.aarch64
diff -u src/sys/arch/aarch64/conf/files.aarch64:1.21 src/sys/arch/aarch64/conf/files.aarch64:1.22
--- src/sys/arch/aarch64/conf/files.aarch64:1.21	Mon Apr 13 07:09:50 2020
+++ src/sys/arch/aarch64/conf/files.aarch64	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.aarch64,v 1.21 2020/04/13 07:09:50 maxv Exp $
+#	$NetBSD: files.aarch64,v 1.22 2020/04/18 11:00:37 skrll Exp $
 
 defflag opt_cpuoptions.h	AARCH64_ALIGNMENT_CHECK
 defflag opt_cpuoptions.h	AARCH64_EL0_STACK_ALIGNMENT_CHECK
@@ -48,9 +48,6 @@ file	arch/arm/arm/psci_arm.S			psci
 defflag	opt_efi.h		EFI_RUNTIME
 file	arch/arm/arm/efi_runtime.c		efi_runtime
 
-# PMAP_DEBUG (heavily abused option)
-defflag				PMAP_DEBUG
-
 # PMAP options
 defflag opt_pmap.h		PMAPHIST : KERNHIST
 defflag opt_pmap.h		PMAPCOUNTERS PMAP_STEAL_MEMORY

Index: src/sys/arch/acorn32/acorn32/rpc_machdep.c
diff -u src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.97 src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.98
--- src/sys/arch/acorn32/acorn32/rpc_machdep.c:1.97	Sat Apr 18 10:55:43 2020
+++ src/sys/arch/acorn32/acorn32/rpc_machdep.c	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_machdep.c,v 1.97 2020/04/18 10:55:43 skrll Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.98 2020/04/18 11:00:37 skrll Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -49,13 +49,12 @@
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
-#include "opt_pmap_debug.h"
 #include "vidcvideo.h"
 #include "podulebus.h"
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.97 2020/04/18 10:55:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.98 2020/04/18 11:00:37 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -142,10 +141,6 @@ u_int videodram_size = 0;	/* Amount of D
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif	/* PMAP_DEBUG */
-
 #define	KERNEL_PT_VMEM		0 /* Page table for mapping video memory */
 #define	KERNEL_PT_SYS		1 /* Page table for mapping proc0 zero page */
 #define	KERNEL_PT_KERNEL	2 /* Page table for mapping kernel 0-4MB*/
@@ -417,7 +412,6 @@ initarm(void *cookie)
 	/* if the wscons interface is used, switch off VERBOSE booting :( */
 #if NVIDCVIDEO>0
 #	undef VERBOSE_INIT_ARM
-#	undef PMAP_DEBUG
 #endif
 
 	/*
@@ -873,11 +867,10 @@ initarm(void *cookie)
 	    abtstack.pv_va + ABT_STACK_SIZE * PAGE_SIZE);
 	set_stackptr(PSR_UND32_MODE,
 	    undstack.pv_va + UND_STACK_SIZE * PAGE_SIZE);
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
-		    kernelstack.pv_pa);
-#endif	/* PMAP_DEBUG */
+#ifdef VERBOSE_INIT_ARM
+	printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
+	    kernelstack.pv_pa);
+#endif	/* VERBOSE_INIT_ARM */
 
 	/*
 	 * Well we should set a data abort handler.

Index: src/sys/arch/acorn32/conf/EB7500ATX
diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.70 src/sys/arch/acorn32/conf/EB7500ATX:1.71
--- src/sys/arch/acorn32/conf/EB7500ATX:1.70	Sat Apr 18 10:55:43 2020
+++ src/sys/arch/acorn32/conf/EB7500ATX	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: EB7500ATX,v 1.70 2020/04/18 10:55:43 skrll Exp $
+#	$NetBSD: EB7500ATX,v 1.71 2020/04/18 11:00:37 skrll Exp $
 #
 #	EB7500ATX --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include 	"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"EB7500ATX-$Revision: 1.70 $"
+#ident		"EB7500ATX-$Revision: 1.71 $"
 
 # estimated number of users
 maxusers	32
@@ -133,7 +133,7 @@ makeoptions	COPY_SYMTAB=1
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.130 src/sys/arch/acorn32/conf/GENERIC:1.131
--- src/sys/arch/acorn32/conf/GENERIC:1.130	Sun Jan 19 01:25:03 2020
+++ src/sys/arch/acorn32/conf/GENERIC	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.130 2020/01/19 01:25:03 thorpej Exp $
+# 	$NetBSD: GENERIC,v 1.131 2020/04/18 11:00:37 skrll Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include 	"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.130 $"
+#ident		"GENERIC-$Revision: 1.131 $"
 
 # estimated number of users
 maxusers	32
@@ -138,7 +138,7 @@ options 	BUFQ_PRIOCSCAN
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		#
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/acorn32/conf/INSTALL
diff -u src/sys/arch/acorn32/conf/INSTALL:1.84 src/sys/arch/acorn32/conf/INSTALL:1.85
--- src/sys/arch/acorn32/conf/INSTALL:1.84	Sun Jan 19 01:25:03 2020
+++ src/sys/arch/acorn32/conf/INSTALL	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.84 2020/01/19 01:25:03 thorpej Exp $
+#	$NetBSD: INSTALL,v 1.85 2020/04/18 11:00:37 skrll Exp $
 #
 #	INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -22,7 +22,7 @@ include 	"arch/acorn32/conf/std.acorn32"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"INSTALL-$Revision: 1.84 $"
+#ident		"INSTALL-$Revision: 1.85 $"
 
 # estimated number of users
 maxusers	32
@@ -119,7 +119,7 @@ options		PIPE_SOCKETPAIR		# smaller, but
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 pseudo-device	ksyms
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/acorn32/conf/LOWMEM_WSCONS
diff -u src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.76 src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.77
--- src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.76	Sun Jan 19 01:25:03 2020
+++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: LOWMEM_WSCONS,v 1.76 2020/01/19 01:25:03 thorpej Exp $
+#	$NetBSD: LOWMEM_WSCONS,v 1.77 2020/04/18 11:00:37 skrll Exp $
 #
 #	LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -97,7 +97,7 @@ options 	USERCONF	# userconf(4) support
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/acorn32/conf/NC
diff -u src/sys/arch/acorn32/conf/NC:1.77 src/sys/arch/acorn32/conf/NC:1.78
--- src/sys/arch/acorn32/conf/NC:1.77	Wed Mar 25 17:06:17 2020
+++ src/sys/arch/acorn32/conf/NC	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: NC,v 1.77 2020/03/25 17:06:17 jdolecek Exp $
+#	$NetBSD: NC,v 1.78 2020/04/18 11:00:37 skrll Exp $
 #
 #	NC - with wscons
 #
@@ -90,7 +90,7 @@ options 	USERCONF	# userconf(4) support
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 pseudo-device	ksyms
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c
diff -u src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.33 src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.34
--- src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c:1.33	Sat Apr 18 10:55:43 2020
+++ src/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: eb7500atx_machdep.c,v 1.33 2020/04/18 10:55:43 skrll Exp $	*/
+/*	$NetBSD: eb7500atx_machdep.c,v 1.34 2020/04/18 11:00:37 skrll Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
@@ -49,13 +49,12 @@
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
-#include "opt_pmap_debug.h"
 #include "vidcvideo.h"
 #include "pckbc.h"
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.33 2020/04/18 10:55:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.34 2020/04/18 11:00:37 skrll Exp $");
 
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -148,10 +147,6 @@ u_int videodram_size = 0;	/* Amount of D
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif	/* PMAP_DEBUG */
-
 #define	KERNEL_PT_VMEM		0 /* Page table for mapping video memory */
 #define	KERNEL_PT_SYS		1 /* Page table for mapping proc0 zero page */
 #define	KERNEL_PT_KERNEL	2 /* Page table for mapping kernel */
@@ -382,7 +377,6 @@ initarm(void *cookie)
 	/* if the wscons interface is used, switch off VERBOSE booting :( */
 #if NVIDCVIDEO>0
 #	undef VERBOSE_INIT_ARM
-#	undef PMAP_DEBUG
 #endif
 
 	/*
@@ -811,11 +805,10 @@ initarm(void *cookie)
 	    abtstack.pv_va + ABT_STACK_SIZE * PAGE_SIZE);
 	set_stackptr(PSR_UND32_MODE,
 	    undstack.pv_va + UND_STACK_SIZE * PAGE_SIZE);
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
-		    kernelstack.pv_pa);
-#endif	/* PMAP_DEBUG */
+#ifdef VERBOSE_INIT_ARM
+	printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
+	    kernelstack.pv_pa);
+#endif	/* VERBOSE_INIT_ARM */
 
 	/*
 	 * Well we should set a data abort handler.

Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.132 src/sys/arch/arm/arm32/arm32_machdep.c:1.133
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.132	Sat Feb 15 08:16:11 2020
+++ src/sys/arch/arm/arm32/arm32_machdep.c	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm32_machdep.c,v 1.132 2020/02/15 08:16:11 skrll Exp $	*/
+/*	$NetBSD: arm32_machdep.c,v 1.133 2020/04/18 11:00:37 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.132 2020/02/15 08:16:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.133 2020/04/18 11:00:37 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_arm_start.h"
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: arm32_machde
 #include "opt_modular.h"
 #include "opt_md.h"
 #include "opt_multiprocessor.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 
@@ -566,13 +565,6 @@ parse_mi_bootargs(char *args)
 		if (integer)
 			boothowto |= RB_ASKNAME;
 
-#ifdef PMAP_DEBUG
-	if (get_bootconf_option(args, "pmapdebug", BOOTOPT_TYPE_INT, &integer)) {
-		pmap_debug_level = integer;
-		pmap_debug(pmap_debug_level);
-	}
-#endif	/* PMAP_DEBUG */
-
 /*	if (get_bootconf_option(args, "nbuf", BOOTOPT_TYPE_INT, &integer))
 		bufpages = integer;*/
 

Index: src/sys/arch/arm/arm32/vm_machdep.c
diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.75 src/sys/arch/arm/arm32/vm_machdep.c:1.76
--- src/sys/arch/arm/arm32/vm_machdep.c:1.75	Thu Jul 12 12:48:50 2018
+++ src/sys/arch/arm/arm32/vm_machdep.c	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.75 2018/07/12 12:48:50 jakllsch Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.76 2020/04/18 11:00:37 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,10 +44,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.75 2018/07/12 12:48:50 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.76 2020/04/18 11:00:37 skrll Exp $");
 
 #include "opt_armfpe.h"
-#include "opt_pmap_debug.h"
 #include "opt_cputypes.h"
 
 #include <sys/param.h>
@@ -110,10 +109,9 @@ cpu_lwp_fork(struct lwp *l1, struct lwp 
 	const struct pcb * const pcb1 = lwp_getpcb(l1);
 	struct pcb * const pcb2 = lwp_getpcb(l2);
 
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level > 0)
-		printf("cpu_lwp_fork: %p %p %p %p\n", l1, l2, curlwp, &lwp0);
-#endif	/* PMAP_DEBUG */
+#ifdef XXXDEBUG
+	printf("cpu_lwp_fork: %p %p %p %p\n", l1, l2, curlwp, &lwp0);
+#endif	/* DEBUG */
 
 	/* Copy the pcb */
 	*pcb2 = *pcb1;
@@ -139,14 +137,12 @@ cpu_lwp_fork(struct lwp *l1, struct lwp 
 	    (USPACE_SVC_STACK_TOP - USPACE_SVC_STACK_BOTTOM));
 #endif	/* STACKCHECKS */
 
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level > 0) {
-		printf("l1: pcb=%p pid=%d pmap=%p\n",
-		    pcb1, l1->l_lid, l1->l_proc->p_vmspace->vm_map.pmap);
-		printf("l2: pcb=%p pid=%d pmap=%p\n",
-		    pcb2, l2->l_lid, l2->l_proc->p_vmspace->vm_map.pmap);
-	}
-#endif	/* PMAP_DEBUG */
+#ifdef XXXDEBUG
+	printf("l1: pcb=%p pid=%d pmap=%p\n",
+	    pcb1, l1->l_lid, l1->l_proc->p_vmspace->vm_map.pmap);
+	printf("l2: pcb=%p pid=%d pmap=%p\n",
+	    pcb2, l2->l_lid, l2->l_proc->p_vmspace->vm_map.pmap);
+#endif	/* DEBUG */
 
 	struct trapframe *tf = (struct trapframe *)pcb2->pcb_ksp - 1;
 	lwp_settrapframe(l2, tf);
@@ -211,11 +207,10 @@ vmapbuf(struct buf *bp, vsize_t len)
 
 	KASSERT(pm != pmap_kernel());
 
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level > 0)
-		printf("vmapbuf: bp=%08x buf=%08x len=%08x\n", (u_int)bp,
-		    (u_int)bp->b_data, (u_int)len);
-#endif	/* PMAP_DEBUG */
+#ifdef XXXDEBUG
+	printf("vmapbuf: bp=%08x buf=%08x len=%08x\n", (u_int)bp,
+	    (u_int)bp->b_data, (u_int)len);
+#endif	/* XXXDEBUG */
 
 	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vmapbuf");
@@ -253,11 +248,10 @@ vunmapbuf(struct buf *bp, vsize_t len)
 {
 	vaddr_t addr, off;
 
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level > 0)
-		printf("vunmapbuf: bp=%08x buf=%08x len=%08x\n",
-		    (u_int)bp, (u_int)bp->b_data, (u_int)len);
-#endif	/* PMAP_DEBUG */
+#ifdef XXXDEBUG
+	printf("vunmapbuf: bp=%08x buf=%08x len=%08x\n",
+	    (u_int)bp, (u_int)bp->b_data, (u_int)len);
+#endif	/* XXXDEBUG */
 
 	if ((bp->b_flags & B_PHYS) == 0)
 		panic("vunmapbuf");

Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.26 src/sys/arch/arm/at91/at91bus.c:1.27
--- src/sys/arch/arm/at91/at91bus.c:1.26	Sat Apr 18 10:55:43 2020
+++ src/sys/arch/arm/at91/at91bus.c	Sat Apr 18 11:00:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: at91bus.c,v 1.26 2020/04/18 10:55:43 skrll Exp $	*/
+/*	$NetBSD: at91bus.c,v 1.27 2020/04/18 11:00:37 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -27,13 +27,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.26 2020/04/18 10:55:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.27 2020/04/18 11:00:37 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 #include "locators.h"
 
 /* Define various stack sizes in pages */
@@ -107,10 +106,6 @@ paddr_t msgbufphys;
 
 //static struct arm32_dma_range dma_ranges[4];
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping vectors page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.156 src/sys/arch/arm/conf/files.arm:1.157
--- src/sys/arch/arm/conf/files.arm:1.156	Mon Apr 13 07:09:51 2020
+++ src/sys/arch/arm/conf/files.arm	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.156 2020/04/13 07:09:51 maxv Exp $
+#	$NetBSD: files.arm,v 1.157 2020/04/18 11:00:38 skrll Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag				ARM32
@@ -116,9 +116,6 @@ file	arch/arm/arm/psci_arm.S			psci
 defflag	opt_efi.h		EFI_RUNTIME
 file	arch/arm/arm/efi_runtime.c		efi_runtime
 
-# PMAP_DEBUG (heavily abused option)
-defflag				PMAP_DEBUG
-
 # New PMAP options
 defflag	opt_arm32_pmap.h	PMAPCOUNTERS
 				PMAP_STEAL_MEMORY PMAP_NEED_ALLOC_POOLPAGE

Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.166 src/sys/arch/arm/include/arm32/pmap.h:1.167
--- src/sys/arch/arm/include/arm32/pmap.h:1.166	Sun Mar 29 21:34:33 2020
+++ src/sys/arch/arm/include/arm32/pmap.h	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.166 2020/03/29 21:34:33 skrll Exp $	*/
+/*	$NetBSD: pmap.h,v 1.167 2020/04/18 11:00:38 skrll Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -339,7 +339,6 @@ extern bool arm_has_tlbiasid_p;	/* also 
 /*
  * Commonly referenced structures
  */
-extern int		pmap_debug_level; /* Only exists if PMAP_DEBUG */
 extern int		arm_poolpage_vmfreelist;
 
 /*
@@ -407,7 +406,6 @@ bool	pmap_get_pde_pte(pmap_t, vaddr_t, p
 bool	pmap_get_pde(pmap_t, vaddr_t, pd_entry_t **);
 bool	pmap_extract_coherency(pmap_t, vaddr_t, paddr_t *, bool *);
 
-void	pmap_debug(int);
 void	pmap_postinit(void);
 
 void	vector_page_setprot(int);

Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.88 src/sys/arch/cats/cats/cats_machdep.c:1.89
--- src/sys/arch/cats/cats/cats_machdep.c:1.88	Tue Jul 16 14:41:44 2019
+++ src/sys/arch/cats/cats/cats_machdep.c	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: cats_machdep.c,v 1.88 2019/07/16 14:41:44 skrll Exp $	*/
+/*	$NetBSD: cats_machdep.c,v 1.89 2020/04/18 11:00:38 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,11 +40,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.88 2019/07/16 14:41:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.89 2020/04/18 11:00:38 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_modular.h"
-#include "opt_pmap_debug.h"
 
 #include "isadma.h"
 
@@ -115,12 +114,6 @@ static char bootargs[MAX_BOOT_STRING + 1
 char *boot_args = NULL;
 char *boot_file = NULL;
 
-
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
-
 /* Prototypes */
 
 void consinit(void);

Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.179 src/sys/arch/cats/conf/GENERIC:1.180
--- src/sys/arch/cats/conf/GENERIC:1.179	Sat Apr 18 10:55:43 2020
+++ src/sys/arch/cats/conf/GENERIC	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.179 2020/04/18 10:55:43 skrll Exp $
+# $NetBSD: GENERIC,v 1.180 2020/04/18 11:00:38 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -164,7 +164,6 @@ options 	WSDISPLAY_COMPAT_RAWKBD		# can 
 
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.114 src/sys/arch/cats/conf/INSTALL:1.115
--- src/sys/arch/cats/conf/INSTALL:1.114	Sat Jan 25 18:38:35 2020
+++ src/sys/arch/cats/conf/INSTALL	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.114 2020/01/25 18:38:35 thorpej Exp $
+#	$NetBSD: INSTALL,v 1.115 2020/04/18 11:00:38 skrll Exp $
 #
 #	CATSINST -- CHALTECH CATS Install kernel
 #
@@ -119,7 +119,7 @@ options 	WSDISPLAY_COMPAT_RAWKBD		# can 
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 pseudo-device	ksyms
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.49 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.50
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.49	Sat Apr 18 10:55:43 2020
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: brh_machdep.c,v 1.49 2020/04/18 10:55:43 skrll Exp $	*/
+/*	$NetBSD: brh_machdep.c,v 1.50 2020/04/18 11:00:38 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,12 +73,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.49 2020/04/18 10:55:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.50 2020/04/18 11:00:38 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -151,10 +150,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.35 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.36
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.35	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: armadillo9_machdep.c,v 1.35 2020/04/18 10:55:44 skrll Exp $	*/
+/*	$NetBSD: armadillo9_machdep.c,v 1.36 2020/04/18 11:00:38 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,13 +110,12 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.35 2020/04/18 10:55:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.36 2020/04/18 11:00:38 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -221,10 +220,6 @@ static struct arm32_dma_range armadillo9
 extern void isa_armadillo9_init(u_int, u_int);
 #endif
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping vectors page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/conf/ADI_BRH
diff -u src/sys/arch/evbarm/conf/ADI_BRH:1.73 src/sys/arch/evbarm/conf/ADI_BRH:1.74
--- src/sys/arch/evbarm/conf/ADI_BRH:1.73	Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/ADI_BRH	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: ADI_BRH,v 1.73 2017/09/14 07:58:40 mrg Exp $
+#	$NetBSD: ADI_BRH,v 1.74 2020/04/18 11:00:38 skrll Exp $
 #
 #	ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
 #
@@ -111,7 +111,7 @@ options 	MIIVERBOSE	# Verbose MII autoco
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
Index: src/sys/arch/evbarm/conf/SMDK2410
diff -u src/sys/arch/evbarm/conf/SMDK2410:1.73 src/sys/arch/evbarm/conf/SMDK2410:1.74
--- src/sys/arch/evbarm/conf/SMDK2410:1.73	Wed Jan 29 18:39:01 2020
+++ src/sys/arch/evbarm/conf/SMDK2410	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: SMDK2410,v 1.73 2020/01/29 18:39:01 maya Exp $
+#	$NetBSD: SMDK2410,v 1.74 2020/04/18 11:00:38 skrll Exp $
 #
 #	SMDK2410 -- Samsung's S3C2410 evaluation board.
 #
@@ -123,7 +123,7 @@ options 	USERCONF	# userconf(4) support
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	KGDB
 #options  	DEBUG_KGDB

Index: src/sys/arch/evbarm/conf/ARMADAXP
diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.26 src/sys/arch/evbarm/conf/ARMADAXP:1.27
--- src/sys/arch/evbarm/conf/ARMADAXP:1.26	Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/ARMADAXP	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ARMADAXP,v 1.26 2018/10/23 19:58:52 jdolecek Exp $
+#	$NetBSD: ARMADAXP,v 1.27 2020/04/18 11:00:38 skrll Exp $
 #
 #	ARMADA XP DEV BOARD
 #
@@ -114,7 +114,7 @@ options 	KTRACE		# system call tracing, 
 options 	LOCKDEBUG
 options 	DIAGNOSTIC		# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG		# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	PMAPCOUNTERS
 #options 	VERBOSE_INIT_ARM	# verbose bootstraping messages
 options 	DDB			# in-kernel debugger
@@ -136,7 +136,6 @@ makeoptions	COPY_SYMTAB=1
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.21 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.22
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.21	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.21 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.22 2020/04/18 11:00:38 skrll Exp $
 #
 # ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
 #
@@ -52,7 +52,7 @@ options 	VERBOSE_INIT_ARM # verbose boot
 options 	DIAGNOSTIC	# internally consistency checks
 				# XXX to be commented out on release branch/
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	LOCKDEBUG	# expensive locking checks/support
 options 	IRQSTATS	# manage IRQ statistics
 #options 	NO_POWERSAVE	# uncomment this to run under ICE
Index: src/sys/arch/evbarm/conf/VTC100
diff -u src/sys/arch/evbarm/conf/VTC100:1.21 src/sys/arch/evbarm/conf/VTC100:1.22
--- src/sys/arch/evbarm/conf/VTC100:1.21	Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/conf/VTC100	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: VTC100,v 1.21 2019/05/18 08:49:23 skrll Exp $
+#	$NetBSD: VTC100,v 1.22 2020/04/18 11:00:38 skrll Exp $
 #
 #	VTC100 -- NEXCOM VTC100 Kernel
 #
@@ -116,7 +116,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
@@ -137,7 +137,6 @@ options 	CONSADDR=0x48022000, CONSPEED=1
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/ARMADILLO210
diff -u src/sys/arch/evbarm/conf/ARMADILLO210:1.44 src/sys/arch/evbarm/conf/ARMADILLO210:1.45
--- src/sys/arch/evbarm/conf/ARMADILLO210:1.44	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/ARMADILLO210	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: ARMADILLO210,v 1.44 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: ARMADILLO210,v 1.45 2020/04/18 11:00:38 skrll Exp $
 #
 #	ARMADILLO210 -- Atmark Techno, Armadillo-210
 #
@@ -106,7 +106,7 @@ options 	PIPE_SOCKETPAIR	# smaller, but 
 
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	DDB		# in-kernel debugger
 #options	DDB_ONPANIC=1

Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.61 src/sys/arch/evbarm/conf/ARMADILLO9:1.62
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.61	Sun Jan 19 01:25:04 2020
+++ src/sys/arch/evbarm/conf/ARMADILLO9	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: ARMADILLO9,v 1.61 2020/01/19 01:25:04 thorpej Exp $
+#	$NetBSD: ARMADILLO9,v 1.62 2020/04/18 11:00:38 skrll Exp $
 #
 #	ARMADILLO9 -- Atmark Techno, Armadillo-9
 #
@@ -106,7 +106,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 #options	DDB_ONPANIC=1
Index: src/sys/arch/evbarm/conf/LUBBOCK
diff -u src/sys/arch/evbarm/conf/LUBBOCK:1.61 src/sys/arch/evbarm/conf/LUBBOCK:1.62
--- src/sys/arch/evbarm/conf/LUBBOCK:1.61	Sun Jan 19 20:00:37 2020
+++ src/sys/arch/evbarm/conf/LUBBOCK	Sat Apr 18 11:00:38 2020
@@ -102,7 +102,7 @@ options 	PCMCIAVERBOSE	# verbose PCMCIA 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/BCM5301X
diff -u src/sys/arch/evbarm/conf/BCM5301X:1.34 src/sys/arch/evbarm/conf/BCM5301X:1.35
--- src/sys/arch/evbarm/conf/BCM5301X:1.34	Mon Aug 12 07:59:17 2019
+++ src/sys/arch/evbarm/conf/BCM5301X	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BCM5301X,v 1.34 2019/08/12 07:59:17 skrll Exp $
+#	$NetBSD: BCM5301X,v 1.35 2020/04/18 11:00:38 skrll Exp $
 #
 #	BCM5301X -- Broadcom BCM5301X Eval Board Kernel
 #
@@ -128,7 +128,7 @@ options 	RNDVERBOSE	# Verbose rnd messag
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
 #options 	LOCKDEBUG	# Enable lock debugging
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
@@ -150,7 +150,6 @@ options UHUB_DEBUG
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
Index: src/sys/arch/evbarm/conf/IMX31LITE
diff -u src/sys/arch/evbarm/conf/IMX31LITE:1.34 src/sys/arch/evbarm/conf/IMX31LITE:1.35
--- src/sys/arch/evbarm/conf/IMX31LITE:1.34	Sat Jul 14 15:09:41 2018
+++ src/sys/arch/evbarm/conf/IMX31LITE	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IMX31LITE,v 1.34 2018/07/14 15:09:41 maxv Exp $
+#	$NetBSD: IMX31LITE,v 1.35 2020/04/18 11:00:38 skrll Exp $
 #
 #	IMX31LITE -- Freescale IMX31LITE Evaluation Board Kernel
 #
@@ -108,7 +108,7 @@ options 	USERCONF	# userconf(4) support
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
 #options 	LOCKDEBUG
-options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/BCM56340
diff -u src/sys/arch/evbarm/conf/BCM56340:1.19 src/sys/arch/evbarm/conf/BCM56340:1.20
--- src/sys/arch/evbarm/conf/BCM56340:1.19	Sun Aug 11 19:34:04 2019
+++ src/sys/arch/evbarm/conf/BCM56340	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BCM56340,v 1.19 2019/08/11 19:34:04 skrll Exp $
+#	$NetBSD: BCM56340,v 1.20 2020/04/18 11:00:38 skrll Exp $
 #
 #	BCM5301X -- Broadcom BCM5301X Eval Board Kernel
 #
@@ -128,7 +128,7 @@ options 	RNDVERBOSE	# Verbose rnd messag
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
 #options 	LOCKDEBUG	# Enable lock debugging
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
@@ -150,7 +150,6 @@ options UHUB_DEBUG
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/CP3100
diff -u src/sys/arch/evbarm/conf/CP3100:1.49 src/sys/arch/evbarm/conf/CP3100:1.50
--- src/sys/arch/evbarm/conf/CP3100:1.49	Wed Aug 21 04:17:40 2019
+++ src/sys/arch/evbarm/conf/CP3100	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: CP3100,v 1.49 2019/08/21 04:17:40 msaitoh Exp $
+#	$NetBSD: CP3100,v 1.50 2020/04/18 11:00:38 skrll Exp $
 #
 #	CP3100 -- Certance CP3100 Kernel
 #
@@ -109,7 +109,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.16 src/sys/arch/evbarm/conf/CUBOX:1.17
--- src/sys/arch/evbarm/conf/CUBOX:1.16	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/CUBOX	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.16 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: CUBOX,v 1.17 2020/04/18 11:00:38 skrll Exp $
 #
 #	CUBOX -- SolidRun Ltd. Cubox kernel
 #
@@ -51,7 +51,7 @@ options 	BUFQ_PRIOCSCAN
 options 	DIAGNOSTIC	# internally consistency checks
 
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	LOCKDEBUG	# expensive locking checks/support
 options 	IRQSTATS	# manage IRQ statistics
 #options 	NO_POWERSAVE	# uncomment this to run under ICE
Index: src/sys/arch/evbarm/conf/DUOVERO
diff -u src/sys/arch/evbarm/conf/DUOVERO:1.16 src/sys/arch/evbarm/conf/DUOVERO:1.17
--- src/sys/arch/evbarm/conf/DUOVERO:1.16	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/DUOVERO	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: DUOVERO,v 1.16 2020/03/25 17:06:18 jdolecek Exp $
+#	$NetBSD: DUOVERO,v 1.17 2020/04/18 11:00:38 skrll Exp $
 #
 #	DUOOVERO -- Gumstix. Inc. DuoVero COMS platforms kernel
 #
@@ -131,7 +131,7 @@ options 	IRQSTATS	# manage IRQ statistic
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
Index: src/sys/arch/evbarm/conf/OMAP5EVM
diff -u src/sys/arch/evbarm/conf/OMAP5EVM:1.16 src/sys/arch/evbarm/conf/OMAP5EVM:1.17
--- src/sys/arch/evbarm/conf/OMAP5EVM:1.16	Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/conf/OMAP5EVM	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: OMAP5EVM,v 1.16 2019/05/18 08:49:23 skrll Exp $
+#	$NetBSD: OMAP5EVM,v 1.17 2020/04/18 11:00:38 skrll Exp $
 #
 #	PANDABOARD -- TI OMAP 4430 Eval Board Kernel
 #
@@ -115,7 +115,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
@@ -138,7 +138,6 @@ options UHUB_DEBUG
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.25 src/sys/arch/evbarm/conf/CUBOX-I:1.26
--- src/sys/arch/evbarm/conf/CUBOX-I:1.25	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/CUBOX-I	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.25 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: CUBOX-I,v 1.26 2020/04/18 11:00:38 skrll Exp $
 #
 # CuBox-i
 # - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -50,7 +50,7 @@ options 	VERBOSE_INIT_ARM # verbose boot
 options 	DIAGNOSTIC	# internally consistency checks
 
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	LOCKDEBUG	# expensive locking checks/support
 options 	IRQSTATS	# manage IRQ statistics
 #options 	NO_POWERSAVE	# uncomment this to run under ICE

Index: src/sys/arch/evbarm/conf/DNS323
diff -u src/sys/arch/evbarm/conf/DNS323:1.13 src/sys/arch/evbarm/conf/DNS323:1.14
--- src/sys/arch/evbarm/conf/DNS323:1.13	Fri Jan  3 03:44:42 2020
+++ src/sys/arch/evbarm/conf/DNS323	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: DNS323,v 1.13 2020/01/03 03:44:42 thorpej Exp $
+#	$NetBSD: DNS323,v 1.14 2020/04/18 11:00:38 skrll Exp $
 #
 #  DNS323 -- D-Link. DNS-323 platform kernel
 #
@@ -16,7 +16,7 @@ no options	CPU_SHEEVA
 
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	DDB		# in-kernel debugger
 #pseudo-device	ksyms

Index: src/sys/arch/evbarm/conf/GEMINI
diff -u src/sys/arch/evbarm/conf/GEMINI:1.38 src/sys/arch/evbarm/conf/GEMINI:1.39
--- src/sys/arch/evbarm/conf/GEMINI:1.38	Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/GEMINI	Sat Apr 18 11:00:38 2020
@@ -99,7 +99,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
@@ -113,8 +113,6 @@ makeoptions	DEBUG="-g"	# compile full sy
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
-#  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
 options 	BOOT_ARGS="\"\""
Index: src/sys/arch/evbarm/conf/GEMINI_SLAVE
diff -u src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.38 src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.39
--- src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.38	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/GEMINI_SLAVE	Sat Apr 18 11:00:38 2020
@@ -99,7 +99,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 pseudo-device	ksyms
@@ -114,7 +114,6 @@ makeoptions	DEBUG="-g"	# compile full sy
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.38 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.39
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.38	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_A6,v 1.38 2020/03/25 17:06:18 jdolecek Exp $
+#	$NetBSD: OPENBLOCKS_A6,v 1.39 2020/04/18 11:00:38 skrll Exp $
 #
 #	OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
 #
@@ -124,7 +124,7 @@ options 	USBVERBOSE	# Verbose USB device
 
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/GEMINI_MASTER
diff -u src/sys/arch/evbarm/conf/GEMINI_MASTER:1.37 src/sys/arch/evbarm/conf/GEMINI_MASTER:1.38
--- src/sys/arch/evbarm/conf/GEMINI_MASTER:1.37	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/GEMINI_MASTER	Sat Apr 18 11:00:38 2020
@@ -100,7 +100,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
@@ -114,7 +114,6 @@ makeoptions	DEBUG="-g"	# compile full sy
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
Index: src/sys/arch/evbarm/conf/MARVELL_NAS
diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.37 src/sys/arch/evbarm/conf/MARVELL_NAS:1.38
--- src/sys/arch/evbarm/conf/MARVELL_NAS:1.37	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/conf/MARVELL_NAS	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: MARVELL_NAS,v 1.37 2020/04/18 10:55:44 skrll Exp $
+#	$NetBSD: MARVELL_NAS,v 1.38 2020/04/18 11:00:38 skrll Exp $
 #
 #  This configuration supports for generically Marvell NAS.
 
@@ -228,7 +228,7 @@ options 	BUFQ_PRIOCSCAN
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=0

Index: src/sys/arch/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.75 src/sys/arch/evbarm/conf/GENERIC:1.76
--- src/sys/arch/evbarm/conf/GENERIC:1.75	Sat Mar 28 08:35:36 2020
+++ src/sys/arch/evbarm/conf/GENERIC	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.75 2020/03/28 08:35:36 isaki Exp $
+#	$NetBSD: GENERIC,v 1.76 2020/04/18 11:00:38 skrll Exp $
 #
 #	GENERIC ARM (aarch32) kernel
 #
@@ -284,7 +284,7 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 
 options 	MSGBUFSIZE=32768
 
Index: src/sys/arch/evbarm/conf/IQ31244
diff -u src/sys/arch/evbarm/conf/IQ31244:1.75 src/sys/arch/evbarm/conf/IQ31244:1.76
--- src/sys/arch/evbarm/conf/IQ31244:1.75	Fri Jan  3 03:44:42 2020
+++ src/sys/arch/evbarm/conf/IQ31244	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ31244,v 1.75 2020/01/03 03:44:42 thorpej Exp $
+#	$NetBSD: IQ31244,v 1.76 2020/04/18 11:00:38 skrll Exp $
 #
 #	IQ31244 -- Intel IQ31244 Evaluation Board Kernel
 #
@@ -109,7 +109,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.35 src/sys/arch/evbarm/conf/GENERIC.common:1.36
--- src/sys/arch/evbarm/conf/GENERIC.common:1.35	Thu Feb 27 16:35:39 2020
+++ src/sys/arch/evbarm/conf/GENERIC.common	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.35 2020/02/27 16:35:39 riastradh Exp $
+#	$NetBSD: GENERIC.common,v 1.36 2020/04/18 11:00:38 skrll Exp $
 #
 #	GENERIC evbarm kernel config (template)
 #
@@ -111,7 +111,7 @@ options 	DIAGNOSTIC	# internal consisten
 #options 	DEBUG
 options 	KDTRACE_HOOKS	# kernel DTrace hooks
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1

Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.153 src/sys/arch/evbarm/conf/GENERIC64:1.154
--- src/sys/arch/evbarm/conf/GENERIC64:1.153	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/conf/GENERIC64	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC64,v 1.153 2020/04/18 10:55:44 skrll Exp $
+#	$NetBSD: GENERIC64,v 1.154 2020/04/18 11:00:38 skrll Exp $
 #
 #	GENERIC ARM (aarch64) kernel
 #
@@ -147,10 +147,9 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	VERBOSE_INIT_ARM # verbose bootstrapping messages
 options 	INCLUDE_CONFIG_FILE
-#options 	UVMHIST
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	UVMHIST_PRINT,KERNHIST_DELAY=0
 
 # EARLYCONS is required for early init messages from VERBOSE_INIT_ARM.

Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.103 src/sys/arch/evbarm/conf/GUMSTIX:1.104
--- src/sys/arch/evbarm/conf/GUMSTIX:1.103	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/GUMSTIX	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.103 2020/03/25 17:06:18 jdolecek Exp $
+#	$NetBSD: GUMSTIX,v 1.104 2020/04/18 11:00:38 skrll Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -129,7 +129,7 @@ options 	MIIVERBOSE	# Verbose MII autoco
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.60 src/sys/arch/evbarm/conf/HDL_G:1.61
--- src/sys/arch/evbarm/conf/HDL_G:1.60	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/HDL_G	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.60 2020/03/25 17:06:18 jdolecek Exp $
+# $NetBSD: HDL_G,v 1.61 2020/04/18 11:00:38 skrll Exp $
 #
 #       HDL_G -- I-O DATA HDL-G Kernel
 #
@@ -110,7 +110,7 @@ options 	USERCONF	# userconf(4) support
 
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
Index: src/sys/arch/evbarm/conf/NAPPI
diff -u src/sys/arch/evbarm/conf/NAPPI:1.60 src/sys/arch/evbarm/conf/NAPPI:1.61
--- src/sys/arch/evbarm/conf/NAPPI:1.60	Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/NAPPI	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: NAPPI,v 1.60 2017/09/14 07:58:40 mrg Exp $
+#	$NetBSD: NAPPI,v 1.61 2020/04/18 11:00:38 skrll Exp $
 #
 #	NAPPI -- Netwise APlication Platform Board Kernel
 #
@@ -102,7 +102,7 @@ options 	USERCONF	# userconf(4) support
 
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.45 src/sys/arch/evbarm/conf/HPT5325:1.46
--- src/sys/arch/evbarm/conf/HPT5325:1.45	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/HPT5325	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: HPT5325,v 1.45 2020/03/25 17:06:18 jdolecek Exp $
+#	$NetBSD: HPT5325,v 1.46 2020/04/18 11:00:38 skrll Exp $
 #
 #  This configuration supports for HP T5325 Thin Client
 #
@@ -131,7 +131,7 @@ options 	BUFQ_PRIOCSCAN
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/HUMMINGBOARD
diff -u src/sys/arch/evbarm/conf/HUMMINGBOARD:1.9 src/sys/arch/evbarm/conf/HUMMINGBOARD:1.10
--- src/sys/arch/evbarm/conf/HUMMINGBOARD:1.9	Sun Aug 11 19:34:04 2019
+++ src/sys/arch/evbarm/conf/HUMMINGBOARD	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: HUMMINGBOARD,v 1.9 2019/08/11 19:34:04 skrll Exp $
+#	$NetBSD: HUMMINGBOARD,v 1.10 2020/04/18 11:00:38 skrll Exp $
 #
 #	Hummingboard -- Freescale i.MX6 Eval Board Kernel
 #
@@ -35,7 +35,6 @@ makeoptions	COPY_SYMTAB=1
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
Index: src/sys/arch/evbarm/conf/VIRT
diff -u src/sys/arch/evbarm/conf/VIRT:1.9 src/sys/arch/evbarm/conf/VIRT:1.10
--- src/sys/arch/evbarm/conf/VIRT:1.9	Thu Oct 18 09:01:54 2018
+++ src/sys/arch/evbarm/conf/VIRT	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: VIRT,v 1.9 2018/10/18 09:01:54 skrll Exp $
+#	$NetBSD: VIRT,v 1.10 2020/04/18 11:00:38 skrll Exp $
 #
 #	QEMU ARM 'virt' virtual machine
 #
@@ -18,7 +18,7 @@ pseudo-device 	openfirm	# /dev/openfirm
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstrapping messages
 #options 	EARLYCONS=virt, CONSADDR=0x09000000
 

Index: src/sys/arch/evbarm/conf/IMX
diff -u src/sys/arch/evbarm/conf/IMX:1.4 src/sys/arch/evbarm/conf/IMX:1.5
--- src/sys/arch/evbarm/conf/IMX:1.4	Mon Aug 19 11:41:36 2019
+++ src/sys/arch/evbarm/conf/IMX	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: IMX,v 1.4 2019/08/19 11:41:36 hkenken Exp $
+#	$NetBSD: IMX,v 1.5 2020/04/18 11:00:38 skrll Exp $
 #
 #	NXP(Freescale) I.MX family SoCs
 #
@@ -30,8 +30,8 @@ pseudo-device 	openfirm	# /dev/openfirm
 
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	IPKDB		# remote kernel debugging
 #options 	VERBOSE_INIT_ARM # verbose bootstrapping messages
 # CONSADDR is required for early init messages from VERBOSE_INIT_ARM.
Index: src/sys/arch/evbarm/conf/KURONAS_X4
diff -u src/sys/arch/evbarm/conf/KURONAS_X4:1.4 src/sys/arch/evbarm/conf/KURONAS_X4:1.5
--- src/sys/arch/evbarm/conf/KURONAS_X4:1.4	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/KURONAS_X4	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: KURONAS_X4,v 1.4 2018/07/12 10:46:43 maxv Exp $
+#	$NetBSD: KURONAS_X4,v 1.5 2020/04/18 11:00:38 skrll Exp $
 #
 #  KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
 #
@@ -20,7 +20,7 @@ config		netbsd-wd0	root on wd0 type ffs
 
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB

Index: src/sys/arch/evbarm/conf/IMX6UL-STARTER
diff -u src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.15 src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.16
--- src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.15	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/IMX6UL-STARTER	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IMX6UL-STARTER,v 1.15 2020/03/25 17:06:18 jdolecek Exp $
+#	$NetBSD: IMX6UL-STARTER,v 1.16 2020/04/18 11:00:38 skrll Exp $
 #
 #	IMX6UL-STARTER - Freescale i.MX6UL Evaluation Board
 #
@@ -51,7 +51,7 @@ options 	VERBOSE_INIT_ARM # verbose boot
 options 	DIAGNOSTIC	# internally consistency checks
 
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	LOCKDEBUG	# expensive locking checks/support
 options 	IRQSTATS	# manage IRQ statistics
 #options 	NO_POWERSAVE	# uncomment this to run under ICE

Index: src/sys/arch/evbarm/conf/INTEGRATOR
diff -u src/sys/arch/evbarm/conf/INTEGRATOR:1.83 src/sys/arch/evbarm/conf/INTEGRATOR:1.84
--- src/sys/arch/evbarm/conf/INTEGRATOR:1.83	Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/INTEGRATOR	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: INTEGRATOR,v 1.83 2017/09/14 07:58:40 mrg Exp $
+#	$NetBSD: INTEGRATOR,v 1.84 2020/04/18 11:00:38 skrll Exp $
 #
 #	GENERIC -- ARM Integrator board Generic kernel
 #
@@ -110,7 +110,7 @@ options 	USERCONF	# userconf(4) support
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	UVMHIST

Index: src/sys/arch/evbarm/conf/INTEGRATOR_CP
diff -u src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.14 src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.15
--- src/sys/arch/evbarm/conf/INTEGRATOR_CP:1.14	Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/INTEGRATOR_CP	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: INTEGRATOR_CP,v 1.14 2017/09/14 07:58:40 mrg Exp $
+#	$NetBSD: INTEGRATOR_CP,v 1.15 2020/04/18 11:00:38 skrll Exp $
 #
 #	INTEGRATOR_CP -- ARM Integrator CP kernel
 #
@@ -110,7 +110,7 @@ options 	USERCONF	# userconf(4) support
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	UVMHIST
Index: src/sys/arch/evbarm/conf/PEPPER
diff -u src/sys/arch/evbarm/conf/PEPPER:1.14 src/sys/arch/evbarm/conf/PEPPER:1.15
--- src/sys/arch/evbarm/conf/PEPPER:1.14	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/PEPPER	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: PEPPER,v 1.14 2020/03/25 17:06:18 jdolecek Exp $
+#	$NetBSD: PEPPER,v 1.15 2020/04/18 11:00:38 skrll Exp $
 #
 #	PEPPER -- Gumstix. Inc. Pepper Single Board Computer platforms kernel
 #
@@ -129,7 +129,7 @@ options 	IRQSTATS	# manage IRQ statistic
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1

Index: src/sys/arch/evbarm/conf/IQ80310
diff -u src/sys/arch/evbarm/conf/IQ80310:1.91 src/sys/arch/evbarm/conf/IQ80310:1.92
--- src/sys/arch/evbarm/conf/IQ80310:1.91	Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/IQ80310	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80310,v 1.91 2017/09/14 07:58:40 mrg Exp $
+#	$NetBSD: IQ80310,v 1.92 2020/04/18 11:00:38 skrll Exp $
 #
 #	IQ80310 -- Intel IQ80310 Evaluation Board Kernel
 #
@@ -111,7 +111,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/IQ80321
diff -u src/sys/arch/evbarm/conf/IQ80321:1.89 src/sys/arch/evbarm/conf/IQ80321:1.90
--- src/sys/arch/evbarm/conf/IQ80321:1.89	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/IQ80321	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80321,v 1.89 2018/07/12 10:46:43 maxv Exp $
+#	$NetBSD: IQ80321,v 1.90 2020/04/18 11:00:38 skrll Exp $
 #
 #	IQ80321 -- Intel IQ80321 Evaluation Board Kernel
 #
@@ -109,7 +109,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.89 src/sys/arch/evbarm/conf/RPI:1.90
--- src/sys/arch/evbarm/conf/RPI:1.89	Sun Jan 26 06:50:18 2020
+++ src/sys/arch/evbarm/conf/RPI	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: RPI,v 1.89 2020/01/26 06:50:18 mlelstv Exp $
+#	$NetBSD: RPI,v 1.90 2020/04/18 11:00:38 skrll Exp $
 #
 #	RPi -- Raspberry Pi
 #
@@ -49,7 +49,6 @@ options 	PLCONSOLE
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/IXDP425
diff -u src/sys/arch/evbarm/conf/IXDP425:1.59 src/sys/arch/evbarm/conf/IXDP425:1.60
--- src/sys/arch/evbarm/conf/IXDP425:1.59	Sat Jan 25 18:38:35 2020
+++ src/sys/arch/evbarm/conf/IXDP425	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IXDP425,v 1.59 2020/01/25 18:38:35 thorpej Exp $
+#	$NetBSD: IXDP425,v 1.60 2020/04/18 11:00:38 skrll Exp $
 #
 #	IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
 #
@@ -114,7 +114,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/IXM1200
diff -u src/sys/arch/evbarm/conf/IXM1200:1.64 src/sys/arch/evbarm/conf/IXM1200:1.65
--- src/sys/arch/evbarm/conf/IXM1200:1.64	Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/IXM1200	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IXM1200,v 1.64 2017/09/14 07:58:40 mrg Exp $
+#	$NetBSD: IXM1200,v 1.65 2020/04/18 11:00:38 skrll Exp $
 #
 #	IXM1200 -- Intel IXM1200 Evaluation Board Kernel
 #
@@ -108,7 +108,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/IYONIX
diff -u src/sys/arch/evbarm/conf/IYONIX:1.5 src/sys/arch/evbarm/conf/IYONIX:1.6
--- src/sys/arch/evbarm/conf/IYONIX:1.5	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/conf/IYONIX	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IYONIX,v 1.5 2020/04/18 10:55:44 skrll Exp $
+#	$NetBSD: IYONIX,v 1.6 2020/04/18 11:00:38 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/evbarm/conf/std.iyonix"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.5 $"
+#ident 		"GENERIC-$Revision: 1.6 $"
 
 maxusers	32		# estimated number of users
 
@@ -86,7 +86,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
 #makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 
 #options 	PMAP_INCLUDE_PTE_SYNC

Index: src/sys/arch/evbarm/conf/KOBO
diff -u src/sys/arch/evbarm/conf/KOBO:1.10 src/sys/arch/evbarm/conf/KOBO:1.11
--- src/sys/arch/evbarm/conf/KOBO:1.10	Wed Jul 24 12:33:18 2019
+++ src/sys/arch/evbarm/conf/KOBO	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: KOBO,v 1.10 2019/07/24 12:33:18 hkenken Exp $
+#	$NetBSD: KOBO,v 1.11 2020/04/18 11:00:38 skrll Exp $
 #
 #	KOBO -- http://kobo.com
 #
@@ -26,6 +26,7 @@ options 	CONSPEED=115200	# Console speed
 
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	KGDB
 makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
@@ -34,7 +35,6 @@ makeoptions	COPY_SYMTAB=1
 #  single		Boot to single user only
 #  kndb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/KUROBOX_PRO
diff -u src/sys/arch/evbarm/conf/KUROBOX_PRO:1.11 src/sys/arch/evbarm/conf/KUROBOX_PRO:1.12
--- src/sys/arch/evbarm/conf/KUROBOX_PRO:1.11	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/KUROBOX_PRO	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: KUROBOX_PRO,v 1.11 2018/07/12 10:46:43 maxv Exp $
+#	$NetBSD: KUROBOX_PRO,v 1.12 2020/04/18 11:00:38 skrll Exp $
 #
 #  KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
 #
@@ -20,7 +20,7 @@ config		netbsd-wd0	root on wd0 type ffs
 
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #options 	KGDB

Index: src/sys/arch/evbarm/conf/MINI2440
diff -u src/sys/arch/evbarm/conf/MINI2440:1.28 src/sys/arch/evbarm/conf/MINI2440:1.29
--- src/sys/arch/evbarm/conf/MINI2440:1.28	Wed Jan 29 18:39:01 2020
+++ src/sys/arch/evbarm/conf/MINI2440	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: MINI2440,v 1.28 2020/01/29 18:39:01 maya Exp $
+#	$NetBSD: MINI2440,v 1.29 2020/04/18 11:00:38 skrll Exp $
 #
 #	MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440
 #
@@ -135,7 +135,7 @@ options 	DDB_KEYCODE=0x1d	# Enter ddb on
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	UVMHIST
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	KGDB

Index: src/sys/arch/evbarm/conf/N900
diff -u src/sys/arch/evbarm/conf/N900:1.33 src/sys/arch/evbarm/conf/N900:1.34
--- src/sys/arch/evbarm/conf/N900:1.33	Sun Nov  3 12:07:46 2019
+++ src/sys/arch/evbarm/conf/N900	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: N900,v 1.33 2019/11/03 12:07:46 jmcneill Exp $
+#	$NetBSD: N900,v 1.34 2020/04/18 11:00:38 skrll Exp $
 #
 #	N900 -- Nokia N900 Kernel
 #
@@ -111,7 +111,7 @@ options 	KTRACE		# system call tracing, 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
 #options 	LOCKDEBUG	# expensive locking checks/support
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
@@ -135,7 +135,6 @@ makeoptions	COPY_SYMTAB=1
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
Index: src/sys/arch/evbarm/conf/OSK5912
diff -u src/sys/arch/evbarm/conf/OSK5912:1.33 src/sys/arch/evbarm/conf/OSK5912:1.34
--- src/sys/arch/evbarm/conf/OSK5912:1.33	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/OSK5912	Sat Apr 18 11:00:38 2020
@@ -97,7 +97,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 pseudo-device	ksyms
@@ -111,7 +111,6 @@ options 	DDB_HISTORY_SIZE=100	# Enable h
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/NETWALKER
diff -u src/sys/arch/evbarm/conf/NETWALKER:1.39 src/sys/arch/evbarm/conf/NETWALKER:1.40
--- src/sys/arch/evbarm/conf/NETWALKER:1.39	Thu Jul 25 16:28:10 2019
+++ src/sys/arch/evbarm/conf/NETWALKER	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: NETWALKER,v 1.39 2019/07/25 16:28:10 skrll Exp $
+#	$NetBSD: NETWALKER,v 1.40 2020/04/18 11:00:38 skrll Exp $
 #
 #	NETWALKER -- http://www.sharp.co.jp/netwalker/
 #
@@ -26,7 +26,6 @@ makeoptions	COPY_SYMTAB=1
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output
Index: src/sys/arch/evbarm/conf/TISDP2430
diff -u src/sys/arch/evbarm/conf/TISDP2430:1.39 src/sys/arch/evbarm/conf/TISDP2430:1.40
--- src/sys/arch/evbarm/conf/TISDP2430:1.39	Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/TISDP2430	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: TISDP2430,v 1.39 2018/10/23 19:58:52 jdolecek Exp $
+#	$NetBSD: TISDP2430,v 1.40 2020/04/18 11:00:38 skrll Exp $
 #
 #	TISDP2430 -- TI OMAP 2430 Eval Board Kernel
 #
@@ -108,7 +108,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
@@ -127,7 +127,6 @@ options UHUB_DEBUG
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/NSLU2
diff -u src/sys/arch/evbarm/conf/NSLU2:1.47 src/sys/arch/evbarm/conf/NSLU2:1.48
--- src/sys/arch/evbarm/conf/NSLU2:1.47	Wed Feb  6 11:58:30 2019
+++ src/sys/arch/evbarm/conf/NSLU2	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: NSLU2,v 1.47 2019/02/06 11:58:30 rin Exp $
+#	$NetBSD: NSLU2,v 1.48 2020/04/18 11:00:38 skrll Exp $
 #
 #	Linksys NSLU2 "Slug" NAS Device
 #
@@ -112,7 +112,7 @@ options 	CONUNIT=0		# Console port numbe
 
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.30 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.31
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.30	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_AX3,v 1.30 2020/03/25 17:06:18 jdolecek Exp $
+#	$NetBSD: OPENBLOCKS_AX3,v 1.31 2020/04/18 11:00:38 skrll Exp $
 #
 #	OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
 #
@@ -133,7 +133,7 @@ options 	USBVERBOSE	# Verbose USB device
 
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
Index: src/sys/arch/evbarm/conf/PANDABOARD
diff -u src/sys/arch/evbarm/conf/PANDABOARD:1.30 src/sys/arch/evbarm/conf/PANDABOARD:1.31
--- src/sys/arch/evbarm/conf/PANDABOARD:1.30	Sun Aug 11 19:34:04 2019
+++ src/sys/arch/evbarm/conf/PANDABOARD	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: PANDABOARD,v 1.30 2019/08/11 19:34:04 skrll Exp $
+#	$NetBSD: PANDABOARD,v 1.31 2020/04/18 11:00:38 skrll Exp $
 #
 #	PANDABOARD -- TI OMAP 4430 Eval Board Kernel
 #
@@ -113,7 +113,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
@@ -137,7 +137,6 @@ options UHUB_DEBUG
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/PARALLELLA
diff -u src/sys/arch/evbarm/conf/PARALLELLA:1.7 src/sys/arch/evbarm/conf/PARALLELLA:1.8
--- src/sys/arch/evbarm/conf/PARALLELLA:1.7	Sun Aug 11 19:34:04 2019
+++ src/sys/arch/evbarm/conf/PARALLELLA	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: PARALLELLA,v 1.7 2019/08/11 19:34:04 skrll Exp $
+#	$NetBSD: PARALLELLA,v 1.8 2020/04/18 11:00:38 skrll Exp $
 #
 #	Parallella -- Xilinx Zynq Eval Board Kernel
 #
@@ -38,7 +38,6 @@ makeoptions	COPY_SYMTAB=1
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.67 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.68
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.67	Wed Mar 25 17:06:18 2020
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: SHEEVAPLUG,v 1.67 2020/03/25 17:06:18 jdolecek Exp $
+#	$NetBSD: SHEEVAPLUG,v 1.68 2020/04/18 11:00:38 skrll Exp $
 #
 #  This configuration supports for generically Marvell SheevaPlug
 #
@@ -135,7 +135,7 @@ options 	USBVERBOSE	# verbose USB device
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG
 #options 	LOCKDEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
Index: src/sys/arch/evbarm/conf/ZAO425
diff -u src/sys/arch/evbarm/conf/ZAO425:1.67 src/sys/arch/evbarm/conf/ZAO425:1.68
--- src/sys/arch/evbarm/conf/ZAO425:1.67	Sat Jan 25 18:38:35 2020
+++ src/sys/arch/evbarm/conf/ZAO425	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: ZAO425,v 1.67 2020/01/25 18:38:35 thorpej Exp $
+#	$NetBSD: ZAO425,v 1.68 2020/04/18 11:00:38 skrll Exp $
 #
 #	ZAO425 -- Intel IXP425
 #
@@ -114,7 +114,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/SMDK2800
diff -u src/sys/arch/evbarm/conf/SMDK2800:1.62 src/sys/arch/evbarm/conf/SMDK2800:1.63
--- src/sys/arch/evbarm/conf/SMDK2800:1.62	Sun Jan 19 01:25:05 2020
+++ src/sys/arch/evbarm/conf/SMDK2800	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: SMDK2800,v 1.62 2020/01/19 01:25:05 thorpej Exp $
+#	$NetBSD: SMDK2800,v 1.63 2020/04/18 11:00:38 skrll Exp $
 #
 #	SMDK2800 -- Samsung's S3C2800 evaluation board.
 #
@@ -112,7 +112,7 @@ options 	USERCONF	# userconf(4) support
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	KGDB
 #options  	DEBUG_KGDB

Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.95 src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.96
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.95	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR,v 1.95 2018/07/12 10:46:43 maxv Exp $
+#	$NetBSD: TEAMASA_NPWR,v 1.96 2020/04/18 11:00:38 skrll Exp $
 #
 #	TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
 #	server appliance.
@@ -117,7 +117,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.53 src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.54
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.53	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR_FC,v 1.53 2018/07/12 10:46:43 maxv Exp $
+#	$NetBSD: TEAMASA_NPWR_FC,v 1.54 2020/04/18 11:00:38 skrll Exp $
 #
 #	TeamASA NPWR-FC, i80321-based SBC
 #
@@ -110,7 +110,7 @@ options 	USERCONF	# userconf(4) support
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/TISDP2420
diff -u src/sys/arch/evbarm/conf/TISDP2420:1.40 src/sys/arch/evbarm/conf/TISDP2420:1.41
--- src/sys/arch/evbarm/conf/TISDP2420:1.40	Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/TISDP2420	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: TISDP2420,v 1.40 2018/10/23 19:58:52 jdolecek Exp $
+#	$NetBSD: TISDP2420,v 1.41 2020/04/18 11:00:38 skrll Exp $
 #
 #	TISDP2420 -- TI OMAP 2420 Eval Board Kernel
 #
@@ -109,7 +109,7 @@ options 	KTRACE		# system call tracing, 
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1
@@ -128,7 +128,6 @@ makeoptions	COPY_SYMTAB=1
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/conf/TS7200
diff -u src/sys/arch/evbarm/conf/TS7200:1.74 src/sys/arch/evbarm/conf/TS7200:1.75
--- src/sys/arch/evbarm/conf/TS7200:1.74	Wed Jan 29 18:39:01 2020
+++ src/sys/arch/evbarm/conf/TS7200	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: TS7200,v 1.74 2020/01/29 18:39:01 maya Exp $
+#	$NetBSD: TS7200,v 1.75 2020/04/18 11:00:38 skrll Exp $
 #
 #	TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
 #
@@ -113,7 +113,7 @@ options 	IRQSTATS	# manage IRQ statistic
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1

Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.78 src/sys/arch/evbarm/conf/TWINTAIL:1.79
--- src/sys/arch/evbarm/conf/TWINTAIL:1.78	Wed Jan 29 18:39:01 2020
+++ src/sys/arch/evbarm/conf/TWINTAIL	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: TWINTAIL,v 1.78 2020/01/29 18:39:01 maya Exp $
+#	$NetBSD: TWINTAIL,v 1.79 2020/04/18 11:00:38 skrll Exp $
 #
 #	TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
 #
@@ -108,7 +108,7 @@ options 	SCSIVERBOSE	# Verbose SCSI erro
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 #options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB

Index: src/sys/arch/evbarm/conf/VIPER
diff -u src/sys/arch/evbarm/conf/VIPER:1.42 src/sys/arch/evbarm/conf/VIPER:1.43
--- src/sys/arch/evbarm/conf/VIPER:1.42	Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/VIPER	Sat Apr 18 11:00:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: VIPER,v 1.42 2018/07/12 10:46:43 maxv Exp $
+#	$NetBSD: VIPER,v 1.43 2020/04/18 11:00:38 skrll Exp $
 #
 #	Arcom Viper
 #
@@ -103,7 +103,7 @@ options 	IRQSTATS	# manage IRQ statistic
 
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1

Index: src/sys/arch/evbarm/conf/ZEDBOARD
diff -u src/sys/arch/evbarm/conf/ZEDBOARD:1.6 src/sys/arch/evbarm/conf/ZEDBOARD:1.7
--- src/sys/arch/evbarm/conf/ZEDBOARD:1.6	Sun Aug 11 19:34:04 2019
+++ src/sys/arch/evbarm/conf/ZEDBOARD	Sat Apr 18 11:00:38 2020
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ZEDBOARD,v 1.6 2019/08/11 19:34:04 skrll Exp $
+#	$NetBSD: ZEDBOARD,v 1.7 2020/04/18 11:00:38 skrll Exp $
 #
 #	ZedBoard -- Xilinx Zynq Eval Board Kernel
 #
@@ -35,7 +35,6 @@ makeoptions	COPY_SYMTAB=1
 #  single		Boot to single user only
 #  kdb			Give control to kernel debugger
 #  ask			Ask for file name to reboot from
-#  pmapdebug=<n>	If PMAP_DEBUG, set pmap_debug_level to <n>
 #  memorydisk=<n>	Set memorydisk size to <n> KB
 #  quiet		Show aprint_naive output
 #  verbose		Show aprint_normal and aprint_verbose output

Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.36 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.37
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.36	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c	Sat Apr 18 11:00:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: g42xxeb_machdep.c,v 1.36 2020/04/18 10:55:44 skrll Exp $ */
+/*	$NetBSD: g42xxeb_machdep.c,v 1.37 2020/04/18 11:00:39 skrll Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004, 2005  Genetec Corporation.
@@ -111,7 +111,6 @@
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 #include "opt_md.h"
 #include "opt_com.h"
 #include "lcd.h"
@@ -184,10 +183,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
 #define	KERNEL_PT_KERNEL_NUM	4

Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.65 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.66
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.65	Sat Feb 15 08:16:12 2020
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c	Sat Apr 18 11:00:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: gumstix_machdep.c,v 1.65 2020/02/15 08:16:12 skrll Exp $ */
+/*	$NetBSD: gumstix_machdep.c,v 1.66 2020/04/18 11:00:39 skrll Exp $ */
 /*
  * Copyright (C) 2005, 2006, 2007  WIDE Project and SOUM Corporation.
  * All rights reserved.
@@ -145,7 +145,6 @@
 #include "opt_gumstix.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
-#include "opt_pmap_debug.h"
 #if defined(OVERO) || defined(DUOVERO) || defined(PEPPER)
 #include "opt_omap.h"
 

Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.29 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.30
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.29	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c	Sat Apr 18 11:00:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdlg_machdep.c,v 1.29 2020/04/18 10:55:44 skrll Exp $	*/
+/*	$NetBSD: hdlg_machdep.c,v 1.30 2020/04/18 11:00:39 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,13 +73,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.29 2020/04/18 10:55:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.30 2020/04/18 11:00:39 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -148,10 +147,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.27 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.28
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.27	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c	Sat Apr 18 11:00:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.27 2020/04/18 10:55:44 skrll Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.28 2020/04/18 11:00:39 skrll Exp $ */
 
 /*
  * Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,13 +110,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.27 2020/04/18 10:55:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.28 2020/04/18 11:00:39 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 #include "opt_md.h"
 #include "opt_com.h"
 
@@ -185,10 +184,6 @@ int max_processes = 64;			/* Default num
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
 #define	KERNEL_PT_KERNEL_NUM	4

Index: src/sys/arch/evbarm/integrator/integrator_machdep.c
diff -u src/sys/arch/evbarm/integrator/integrator_machdep.c:1.78 src/sys/arch/evbarm/integrator/integrator_machdep.c:1.79
--- src/sys/arch/evbarm/integrator/integrator_machdep.c:1.78	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/integrator/integrator_machdep.c	Sat Apr 18 11:00:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: integrator_machdep.c,v 1.78 2020/04/18 10:55:44 skrll Exp $	*/
+/*	$NetBSD: integrator_machdep.c,v 1.79 2020/04/18 11:00:39 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001,2002 ARM Ltd
@@ -68,12 +68,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.78 2020/04/18 10:55:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.79 2020/04/18 11:00:39 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>

Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.92 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.93
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.92	Sat Apr 18 10:55:44 2020
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c	Sat Apr 18 11:00:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_machdep.c,v 1.92 2020/04/18 10:55:44 skrll Exp $	*/
+/*	$NetBSD: iq80310_machdep.c,v 1.93 2020/04/18 11:00:39 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,12 +73,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.92 2020/04/18 10:55:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.93 2020/04/18 11:00:39 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -147,10 +146,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.62 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.63
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.62	Sat Apr 18 10:55:45 2020
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c	Sat Apr 18 11:00:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80321_machdep.c,v 1.62 2020/04/18 10:55:45 skrll Exp $	*/
+/*	$NetBSD: iq80321_machdep.c,v 1.63 2020/04/18 11:00:39 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,12 +73,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.62 2020/04/18 10:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.63 2020/04/18 11:00:39 skrll Exp $");
 
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -149,10 +148,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.44 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.45
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.44	Sat Apr 18 10:55:45 2020
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c	Sat Apr 18 11:00:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixdp425_machdep.c,v 1.44 2020/04/18 10:55:45 skrll Exp $ */
+/*	$NetBSD: ixdp425_machdep.c,v 1.45 2020/04/18 11:00:40 skrll Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -64,13 +64,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.44 2020/04/18 10:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.45 2020/04/18 11:00:40 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -140,10 +139,6 @@ paddr_t msgbufphys;
 
 extern int end;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.64 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.65
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.64	Sat Apr 18 10:55:45 2020
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c	Sat Apr 18 11:00:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixm1200_machdep.c,v 1.64 2020/04/18 10:55:45 skrll Exp $ */
+/*	$NetBSD: ixm1200_machdep.c,v 1.65 2020/04/18 11:00:40 skrll Exp $ */
 
 /*
  * Copyright (c) 2002, 2003
@@ -61,13 +61,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.64 2020/04/18 10:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.65 2020/04/18 11:00:40 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_modular.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -163,10 +162,6 @@ paddr_t msgbufphys;
 
 extern int end;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif  /* PMAP_DEBUG */
-
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
 #define KERNEL_PT_KERNEL_NUM	2
@@ -363,10 +358,6 @@ initarm(void *arg)
 
 	symbolsize = 0;
 
-#ifdef PMAP_DEBUG
-	pmap_debug(-1);
-#endif
-
 #if NKSYMS || defined(DDB) || defined(MODULAR)
         if (! memcmp(&end, "\177ELF", 4)) {
                 sh = (Elf_Shdr *)((char *)&end + ((Elf_Ehdr *)&end)->e_shoff);
@@ -638,11 +629,10 @@ initarm(void *arg)
 	    abtstack.pv_va + ABT_STACK_SIZE * PAGE_SIZE);
 	set_stackptr(PSR_UND32_MODE,
 	    undstack.pv_va + UND_STACK_SIZE * PAGE_SIZE);
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
-		    kernelstack.pv_pa);
-#endif  /* PMAP_DEBUG */
+#ifdef VERBOSE_INIT_ARM
+	printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
+	    kernelstack.pv_pa);
+#endif  /* VERBOSE_INIT_ARM */
 
 	/*
 	 * Well we should set a data abort handler.

Index: src/sys/arch/evbarm/iyonix/iyonix_machdep.c
diff -u src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.3 src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.4
--- src/sys/arch/evbarm/iyonix/iyonix_machdep.c:1.3	Sat Apr 18 10:55:45 2020
+++ src/sys/arch/evbarm/iyonix/iyonix_machdep.c	Sat Apr 18 11:00:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: iyonix_machdep.c,v 1.3 2020/04/18 10:55:45 skrll Exp $	*/
+/*	$NetBSD: iyonix_machdep.c,v 1.4 2020/04/18 11:00:40 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,11 +73,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.3 2020/04/18 10:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.4 2020/04/18 11:00:40 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -166,10 +165,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.40 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.41
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.40	Sat Apr 18 10:55:45 2020
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c	Sat Apr 18 11:00:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: lubbock_machdep.c,v 1.40 2020/04/18 10:55:45 skrll Exp $ */
+/*	$NetBSD: lubbock_machdep.c,v 1.41 2020/04/18 11:00:40 skrll Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -112,13 +112,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.40 2020/04/18 10:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.41 2020/04/18 11:00:40 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 #include "opt_md.h"
 #include "opt_com.h"
 #include "lcd.h"
@@ -193,10 +192,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
 #define	KERNEL_PT_KERNEL_NUM	4

Index: src/sys/arch/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.17 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.18
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.17	Sat Apr 18 10:55:45 2020
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c	Sat Apr 18 11:00:40 2020
@@ -131,13 +131,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.17 2020/04/18 10:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.18 2020/04/18 11:00:40 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 #include "opt_md.h"
 
 #include <sys/param.h>
@@ -236,10 +235,6 @@ int max_processes = 64;		/* Default numb
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */
 #define KERNEL_PT_KERNEL_NUM	3	/* L2 tables for mapping kernel VM */

Index: src/sys/arch/evbarm/mmnet/mmnet_machdep.c
diff -u src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.5 src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.6
--- src/sys/arch/evbarm/mmnet/mmnet_machdep.c:1.5	Sat Apr 18 10:55:45 2020
+++ src/sys/arch/evbarm/mmnet/mmnet_machdep.c	Sat Apr 18 11:00:40 2020
@@ -1,5 +1,5 @@
-/*	$Id: mmnet_machdep.c,v 1.5 2020/04/18 10:55:45 skrll Exp $	*/
-/*	$NetBSD: mmnet_machdep.c,v 1.5 2020/04/18 10:55:45 skrll Exp $	*/
+/*	$Id: mmnet_machdep.c,v 1.6 2020/04/18 11:00:40 skrll Exp $	*/
+/*	$NetBSD: mmnet_machdep.c,v 1.6 2020/04/18 11:00:40 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -78,11 +78,10 @@
 /* Adaptation for Propox MMnet by Aymeric Vincent is in the public domain */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmnet_machdep.c,v 1.5 2020/04/18 10:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmnet_machdep.c,v 1.6 2020/04/18 11:00:40 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>

Index: src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c
diff -u src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.12 src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.13
--- src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c:1.12	Sat Apr 18 10:55:45 2020
+++ src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c	Sat Apr 18 11:00:40 2020
@@ -1,5 +1,5 @@
-/*	$Id: mpcsa_machdep.c,v 1.12 2020/04/18 10:55:45 skrll Exp $	*/
-/*	$NetBSD: mpcsa_machdep.c,v 1.12 2020/04/18 10:55:45 skrll Exp $	*/
+/*	$Id: mpcsa_machdep.c,v 1.13 2020/04/18 11:00:40 skrll Exp $	*/
+/*	$NetBSD: mpcsa_machdep.c,v 1.13 2020/04/18 11:00:40 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -77,11 +77,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.12 2020/04/18 10:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpcsa_machdep.c,v 1.13 2020/04/18 11:00:40 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>

Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.27 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.28
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.27	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c	Sat Apr 18 11:00:40 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: npwr_fc_machdep.c,v 1.27 2020/04/18 10:55:46 skrll Exp $	*/
+/*	$NetBSD: npwr_fc_machdep.c,v 1.28 2020/04/18 11:00:40 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,13 +73,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.27 2020/04/18 10:55:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.28 2020/04/18 11:00:40 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -149,10 +148,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.33 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.34
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.33	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nslu2_machdep.c,v 1.33 2020/04/18 10:55:46 skrll Exp $	*/
+/*	$NetBSD: nslu2_machdep.c,v 1.34 2020/04/18 11:00:41 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,13 +94,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.33 2020/04/18 10:55:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.34 2020/04/18 11:00:41 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -170,10 +169,6 @@ paddr_t msgbufphys;
 
 extern int end;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.43 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.44
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.43	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2410_machdep.c,v 1.43 2020/04/18 10:55:46 skrll Exp $ */
+/*	$NetBSD: smdk2410_machdep.c,v 1.44 2020/04/18 11:00:41 skrll Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,13 +105,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.43 2020/04/18 10:55:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.44 2020/04/18 11:00:41 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 #include "opt_md.h"
 
 #include <sys/param.h>
@@ -201,10 +200,6 @@ int max_processes = 64;		/* Default numb
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */
 #define	KERNEL_PT_KERNEL_NUM	2	/* L2 tables for mapping kernel VM */

Index: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.48 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.49
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.48	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: smdk2800_machdep.c,v 1.48 2020/04/18 10:55:46 skrll Exp $ */
+/*	$NetBSD: smdk2800_machdep.c,v 1.49 2020/04/18 11:00:41 skrll Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,12 +106,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.48 2020/04/18 10:55:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.49 2020/04/18 11:00:41 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_console.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 #include "opt_md.h"
 #include "pci.h"
 
@@ -191,10 +190,6 @@ int max_processes = 64;		/* Default numb
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */
 #define	KERNEL_PT_KERNEL_NUM	2	/* L2 tables for mapping kernel VM */

Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.30 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.31
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.30	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsarm_machdep.c,v 1.30 2020/04/18 10:55:46 skrll Exp $ */
+/*	$NetBSD: tsarm_machdep.c,v 1.31 2020/04/18 11:00:41 skrll Exp $ */
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,13 +73,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.30 2020/04/18 10:55:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.31 2020/04/18 11:00:41 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -165,10 +164,6 @@ static struct arm32_dma_range tsarm_dma_
 extern void isa_tsarm_init(u_int, u_int);
 #endif
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping vectors page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.31 src/sys/arch/evbarm/viper/viper_machdep.c:1.32
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.31	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/evbarm/viper/viper_machdep.c	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: viper_machdep.c,v 1.31 2020/04/18 10:55:46 skrll Exp $ */
+/*	$NetBSD: viper_machdep.c,v 1.32 2020/04/18 11:00:41 skrll Exp $ */
 
 /*
  * Startup routines for the Arcom Viper.  Below you can trace the
@@ -112,13 +112,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.31 2020/04/18 10:55:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.32 2020/04/18 11:00:41 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 #include "opt_md.h"
 #include "opt_com.h"
 #include "lcd.h"
@@ -192,10 +191,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
 #define	KERNEL_PT_KERNEL_NUM	4

Index: src/sys/arch/hpcarm/conf/IPAQ
diff -u src/sys/arch/hpcarm/conf/IPAQ:1.83 src/sys/arch/hpcarm/conf/IPAQ:1.84
--- src/sys/arch/hpcarm/conf/IPAQ:1.83	Sun Jan 19 01:25:05 2020
+++ src/sys/arch/hpcarm/conf/IPAQ	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: IPAQ,v 1.83 2020/01/19 01:25:05 thorpej Exp $
+#	$NetBSD: IPAQ,v 1.84 2020/04/18 11:00:41 skrll Exp $
 #
 #	iPAQ H3600 -- Windows-CE based PDA
 #
@@ -101,7 +101,7 @@ options 	BUFQ_PRIOCSCAN
 #options 	BOOT_DUMP	# Enable memorydump at boot
 options 	DIAGNOSTIC	# internal consistency checks
 #options	DEBUG		# expensive debugging checks/support
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/hpcarm/conf/JORNADA720
diff -u src/sys/arch/hpcarm/conf/JORNADA720:1.104 src/sys/arch/hpcarm/conf/JORNADA720:1.105
--- src/sys/arch/hpcarm/conf/JORNADA720:1.104	Sun Jan 19 01:25:05 2020
+++ src/sys/arch/hpcarm/conf/JORNADA720	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: JORNADA720,v 1.104 2020/01/19 01:25:05 thorpej Exp $
+#	$NetBSD: JORNADA720,v 1.105 2020/04/18 11:00:41 skrll Exp $
 #
 #	JORNADA -- Windows-CE based jornada 720
 #
@@ -7,7 +7,7 @@ include	"arch/hpcarm/conf/std.sa11x0"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.104 $"
+#ident 		"GENERIC-$Revision: 1.105 $"
 
 # estimated number of users
 maxusers	32
@@ -106,7 +106,7 @@ options 	BUFQ_PRIOCSCAN
 #options 	BOOT_DUMP	# Enable memorydump at boot
 #options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG		# expensive debugging checks/support
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	KDTRACE_HOOKS	# kernel DTrace hooks
 options 	MODULAR		# DTrace is a module (load via modules.conf)
 options 	DDB		# in-kernel debugger

Index: src/sys/arch/hpcarm/conf/JORNADA820
diff -u src/sys/arch/hpcarm/conf/JORNADA820:1.41 src/sys/arch/hpcarm/conf/JORNADA820:1.42
--- src/sys/arch/hpcarm/conf/JORNADA820:1.41	Sun Jan 19 01:25:05 2020
+++ src/sys/arch/hpcarm/conf/JORNADA820	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: JORNADA820,v 1.41 2020/01/19 01:25:05 thorpej Exp $
+#	$NetBSD: JORNADA820,v 1.42 2020/04/18 11:00:41 skrll Exp $
 #
 #	JORNADA -- Windows-CE based jornada 820
 #
@@ -7,7 +7,7 @@ include	"arch/hpcarm/conf/std.sa11x0"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.41 $"
+#ident 		"GENERIC-$Revision: 1.42 $"
 
 # estimated number of users
 maxusers	32
@@ -99,7 +99,7 @@ options 	NFS_BOOT_DHCP
 options 	BOOT_DUMP	# Enable memorydump at boot
 options 	DIAGNOSTIC	# internal consistency checks
 options 	DEBUG		# expensive debugging checks/support
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/hpcarm/conf/NETBOOKPRO
diff -u src/sys/arch/hpcarm/conf/NETBOOKPRO:1.31 src/sys/arch/hpcarm/conf/NETBOOKPRO:1.32
--- src/sys/arch/hpcarm/conf/NETBOOKPRO:1.31	Tue Mar 24 17:38:33 2020
+++ src/sys/arch/hpcarm/conf/NETBOOKPRO	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: NETBOOKPRO,v 1.31 2020/03/24 17:38:33 sevan Exp $
+#	$NetBSD: NETBOOKPRO,v 1.32 2020/04/18 11:00:41 skrll Exp $
 #
 #	NETBOOKPRO -- Psion Teklogix NETBOOK PRO
 #
@@ -8,7 +8,7 @@ include	"arch/hpcarm/conf/files.netbookp
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.31 $"
+#ident 		"GENERIC-$Revision: 1.32 $"
 
 # estimated number of users
 maxusers	32
@@ -127,7 +127,7 @@ options 	FONT_VT220L8x16
 #options 	BOOT_DUMP	# Enable memorydump at boot
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG		# expensive debugging checks/support
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=512	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/hpcarm/conf/WZERO3
diff -u src/sys/arch/hpcarm/conf/WZERO3:1.52 src/sys/arch/hpcarm/conf/WZERO3:1.53
--- src/sys/arch/hpcarm/conf/WZERO3:1.52	Tue Mar 24 17:38:33 2020
+++ src/sys/arch/hpcarm/conf/WZERO3	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: WZERO3,v 1.52 2020/03/24 17:38:33 sevan Exp $
+#	$NetBSD: WZERO3,v 1.53 2020/04/18 11:00:41 skrll Exp $
 #
 #	WZERO3 -- Sharp Windows Mobile 5 based PDA
 #
@@ -8,7 +8,7 @@ include	"arch/hpcarm/conf/files.wzero3"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.52 $"
+#ident 		"GENERIC-$Revision: 1.53 $"
 
 # estimated number of users
 maxusers	32
@@ -133,7 +133,7 @@ options 	BUFQ_PRIOCSCAN
 #options 	BOOT_DUMP	# Enable memorydump at boot
 options 	DIAGNOSTIC	# internal consistency checks
 #options 	DEBUG		# expensive debugging checks/support
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 #options 	DDB_HISTORY_SIZE=512	# Enable history editing in DDB
 #makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.28 src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.29
--- src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c:1.28	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/hpcarm/hpcarm/pxa2x0_hpc_machdep.c	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.28 2020/04/18 10:55:46 skrll Exp $	*/
+/*	$NetBSD: pxa2x0_hpc_machdep.c,v 1.29 2020/04/18 11:00:41 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,12 +40,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.28 2020/04/18 10:55:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_hpc_machdep.c,v 1.29 2020/04/18 11:00:41 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
 #include "opt_modular.h"
-#include "opt_pmap_debug.h"
 #include "ksyms.h"
 
 #include <sys/param.h>
@@ -113,10 +112,6 @@ extern paddr_t msgbufphys;
 
 extern int end;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif /* PMAP_DEBUG */
-
 #define	KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define	KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
 #define	KERNEL_PT_KERNEL_NUM	4
@@ -544,11 +539,10 @@ init_pxa2x0(int argc, char **argv, struc
 	    abtstack.pv_va + ABT_STACK_SIZE * PAGE_SIZE);
 	set_stackptr(PSR_UND32_MODE,
 	    undstack.pv_va + UND_STACK_SIZE * PAGE_SIZE);
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
-		    kernelstack.pv_pa);
-#endif /* PMAP_DEBUG */
+#ifdef VERBOSE_INIT_ARM
+	printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
+	    kernelstack.pv_pa);
+#endif /* VERBOSE_INIT_ARM */
 
 	/*
 	 * Well we should set a data abort handler.

Index: src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c
diff -u src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.16 src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.17
--- src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c:1.16	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.16 2020/04/18 10:55:46 skrll Exp $	*/
+/*	$NetBSD: sa11x0_hpc_machdep.c,v 1.17 2020/04/18 11:00:41 skrll Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -40,12 +40,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.16 2020/04/18 10:55:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_hpc_machdep.c,v 1.17 2020/04/18 11:00:41 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_dram_pages.h"
 #include "opt_modular.h"
-#include "opt_pmap_debug.h"
 #include "ksyms.h"
 
 #include <sys/param.h>
@@ -105,10 +104,6 @@ extern paddr_t msgbufphys;
 
 extern int end;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif /* PMAP_DEBUG */
-
 #define	KERNEL_PT_VMEM		0	/* Page table for mapping video memory */
 #define	KERNEL_PT_SYS		1	/* Page table for mapping proc0 zero page */
 #define	KERNEL_PT_IO		2	/* Page table for mapping IO */
@@ -466,11 +461,10 @@ init_sa11x0(int argc, char **argv, struc
 	    abtstack.pv_va + ABT_STACK_SIZE * PAGE_SIZE);
 	set_stackptr(PSR_UND32_MODE,
 	    undstack.pv_va + UND_STACK_SIZE * PAGE_SIZE);
-#ifdef PMAP_DEBUG
-	if (pmap_debug_level >= 0)
-		printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
-		    kernelstack.pv_pa);
-#endif /* PMAP_DEBUG */
+#ifdef VERBOSE_INIT_ARM
+	printf("kstack V%08lx P%08lx\n", kernelstack.pv_va,
+	    kernelstack.pv_pa);
+#endif /* VERBOSE_INIT_ARM */
 
 	/*
 	 * Well we should set a data abort handler.

Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.110 src/sys/arch/iyonix/conf/GENERIC:1.111
--- src/sys/arch/iyonix/conf/GENERIC:1.110	Sat Apr 18 10:55:46 2020
+++ src/sys/arch/iyonix/conf/GENERIC	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.110 2020/04/18 10:55:46 skrll Exp $
+#	$NetBSD: GENERIC,v 1.111 2020/04/18 11:00:41 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/iyonix/conf/std.iyonix"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.110 $"
+#ident 		"GENERIC-$Revision: 1.111 $"
 
 maxusers	32		# estimated number of users
 
@@ -85,7 +85,7 @@ options 	DDB_HISTORY_SIZE=512	# enable h
 #options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
 #makeoptions	DEBUG="-g"	# compile full symbol table
 makeoptions	COPY_SYMTAB=1
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
 
 #options 	PMAP_INCLUDE_PTE_SYNC

Index: src/sys/arch/iyonix/iyonix/iyonix_machdep.c
diff -u src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.29 src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.30
--- src/sys/arch/iyonix/iyonix/iyonix_machdep.c:1.29	Sat Apr 18 10:55:47 2020
+++ src/sys/arch/iyonix/iyonix/iyonix_machdep.c	Sat Apr 18 11:00:41 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: iyonix_machdep.c,v 1.29 2020/04/18 10:55:47 skrll Exp $	*/
+/*	$NetBSD: iyonix_machdep.c,v 1.30 2020/04/18 11:00:41 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,11 +73,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.29 2020/04/18 10:55:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.30 2020/04/18 11:00:41 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
-#include "opt_pmap_debug.h"
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -150,10 +149,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* L2 table for mapping zero page */
 
 #define KERNEL_PT_KERNEL	1	/* L2 table for mapping kernel */

Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.138 src/sys/arch/netwinder/conf/GENERIC:1.139
--- src/sys/arch/netwinder/conf/GENERIC:1.138	Sat Apr 18 10:55:47 2020
+++ src/sys/arch/netwinder/conf/GENERIC	Sat Apr 18 11:00:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.138 2020/04/18 10:55:47 skrll Exp $
+# $NetBSD: GENERIC,v 1.139 2020/04/18 11:00:42 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -145,7 +145,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include 
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
 makeoptions	DEBUG="-g"	# compile full symbol table

Index: src/sys/arch/netwinder/netwinder/netwinder_machdep.c
diff -u src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.89 src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.90
--- src/sys/arch/netwinder/netwinder/netwinder_machdep.c:1.89	Sat Apr 18 10:55:47 2020
+++ src/sys/arch/netwinder/netwinder/netwinder_machdep.c	Sat Apr 18 11:00:42 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: netwinder_machdep.c,v 1.89 2020/04/18 10:55:47 skrll Exp $	*/
+/*	$NetBSD: netwinder_machdep.c,v 1.90 2020/04/18 11:00:42 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,10 +40,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.89 2020/04/18 10:55:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.90 2020/04/18 11:00:42 skrll Exp $");
 
 #include "opt_ddb.h"
-#include "opt_pmap_debug.h"
 
 #define	_ARM32_BUS_DMA_PRIVATE
 
@@ -136,10 +135,6 @@ int max_processes = 64;			/* Default num
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
 #define KERNEL_PT_VMDATA	2	/* Page tables for mapping kernel VM */

Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.134 src/sys/arch/shark/conf/GENERIC:1.135
--- src/sys/arch/shark/conf/GENERIC:1.134	Sun Jan 19 01:25:07 2020
+++ src/sys/arch/shark/conf/GENERIC	Sat Apr 18 11:00:42 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.134 2020/01/19 01:25:07 thorpej Exp $
+#	$NetBSD: GENERIC,v 1.135 2020/04/18 11:00:42 skrll Exp $
 #
 # Generic Shark configuration.
 #
@@ -7,7 +7,7 @@ include	"arch/shark/conf/std.shark"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.134 $"
+#ident		"GENERIC-$Revision: 1.135 $"
 
 # estimated number of users
 maxusers	32
@@ -144,7 +144,7 @@ options 	BUFQ_PRIOCSCAN
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 makeoptions	COPY_SYMTAB=1 	# reserve symbol space for DDB
 				# (needed because we boot netbsd.aout)

Index: src/sys/arch/shark/conf/INSTALL
diff -u src/sys/arch/shark/conf/INSTALL:1.64 src/sys/arch/shark/conf/INSTALL:1.65
--- src/sys/arch/shark/conf/INSTALL:1.64	Wed Aug  1 20:04:14 2018
+++ src/sys/arch/shark/conf/INSTALL	Sat Apr 18 11:00:42 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.64 2018/08/01 20:04:14 maxv Exp $
+#	$NetBSD: INSTALL,v 1.65 2020/04/18 11:00:42 skrll Exp $
 #
 #	Shark installation kernel
 #
@@ -112,7 +112,7 @@ options		PIPE_SOCKETPAIR		# smaller, but
 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
 #options 	DIAGNOSTIC	# internal consistency checks
-#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+#options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 pseudo-device	ksyms
 #options 	DDB_ONPANIC=0	# don't run DDB at panictime

Index: src/sys/arch/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.46 src/sys/arch/zaurus/zaurus/machdep.c:1.47
--- src/sys/arch/zaurus/zaurus/machdep.c:1.46	Sat Apr 18 10:55:47 2020
+++ src/sys/arch/zaurus/zaurus/machdep.c	Sat Apr 18 11:00:42 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.46 2020/04/18 10:55:47 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.47 2020/04/18 11:00:42 skrll Exp $	*/
 /*	$OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $	*/
 
 /*
@@ -107,12 +107,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2020/04/18 10:55:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2020/04/18 11:00:42 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
-#include "opt_pmap_debug.h"
 #include "opt_md.h"
 #include "opt_com.h"
 #include "ksyms.h"
@@ -214,10 +213,6 @@ pv_addr_t minidataclean;
 
 paddr_t msgbufphys;
 
-#ifdef PMAP_DEBUG
-extern int pmap_debug_level;
-#endif
-
 #define KERNEL_PT_SYS		0	/* Page table for mapping proc0 zero page */
 #define KERNEL_PT_KERNEL	1	/* Page table for mapping kernel */
 #define	KERNEL_PT_KERNEL_NUM	((KERNEL_VM_BASE - KERNEL_BASE) >> 22)

Reply via email to