diff --git a/sys/arch/evbarm/conf/ARMADAXP b/sys/arch/evbarm/conf/ARMADAXP
index cb6f649ab08f..3be5bdb5616c 100644
--- a/sys/arch/evbarm/conf/ARMADAXP
+++ b/sys/arch/evbarm/conf/ARMADAXP
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ARMADAXP,v 1.27 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: ARMADAXP,v 1.28 2020/06/13 16:51:25 ad Exp $
 #
 #	ARMADA XP DEV BOARD
 #
@@ -115,7 +115,7 @@ options 	LOCKDEBUG
 options 	DIAGNOSTIC		# internal consistency checks
 #options 	DEBUG
 #options 	UVMHIST		# kernhist for uvm/pmap subsystems
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 #options 	VERBOSE_INIT_ARM	# verbose bootstraping messages
 options 	DDB			# in-kernel debugger
 options 	DDB_ONPANIC=1
diff --git a/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 b/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
index d7f03abb8453..1574bdf59dd2 100644
--- a/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
+++ b/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.22 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.23 2020/06/13 16:51:25 ad Exp $
 #
 # ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
 #
@@ -19,7 +19,7 @@ options 	CPU_CORTEX
 options 	CPU_CORTEXA7
 options 	IMX7
 options 	MULTIPROCESSOR
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 
 options 	MEMSIZE=512
 options 	MEMSIZE_RESERVED=32	# only reserved 32M for Cortex-M4 core
diff --git a/sys/arch/evbarm/conf/BCM5301X b/sys/arch/evbarm/conf/BCM5301X
index 2dbda70ac9cd..716b0f50af9e 100644
--- a/sys/arch/evbarm/conf/BCM5301X
+++ b/sys/arch/evbarm/conf/BCM5301X
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BCM5301X,v 1.35 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: BCM5301X,v 1.36 2020/06/13 16:51:25 ad Exp $
 #
 #	BCM5301X -- Broadcom BCM5301X Eval Board Kernel
 #
@@ -26,7 +26,7 @@ options 	BCMETH_COUNTERS
 options 	CPU_CORTEXA9
 #options 	MEMSIZE=256
 options 	BCM5301X
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 options 	BUSDMA_COUNTERS
 makeoptions	KERNEL_BASE_PHYS="0x80100000"
 
diff --git a/sys/arch/evbarm/conf/DUOVERO b/sys/arch/evbarm/conf/DUOVERO
index 31710db7bd20..8f9b3dd8f85d 100644
--- a/sys/arch/evbarm/conf/DUOVERO
+++ b/sys/arch/evbarm/conf/DUOVERO
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: DUOVERO,v 1.17 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: DUOVERO,v 1.18 2020/06/13 16:51:25 ad Exp $
 #
 #	DUOOVERO -- Gumstix. Inc. DuoVero COMS platforms kernel
 #
@@ -19,7 +19,7 @@ options 	OMAP_4430
 options 	MULTIPROCESSOR
 options 	 __HAVE_CPU_UAREA_ALLOC_IDLELWP	# need for MULTIPROCESSOR
 options 	FPU_VFP
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 options 	ARM_HAS_VBAR
 options 	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 makeoptions	CPUFLAGS="-mcpu=cortex-a9 -mfpu=neon"
diff --git a/sys/arch/evbarm/conf/GENERIC.common b/sys/arch/evbarm/conf/GENERIC.common
index a946a8b90ee6..d8402d04e6b9 100644
--- a/sys/arch/evbarm/conf/GENERIC.common
+++ b/sys/arch/evbarm/conf/GENERIC.common
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.36 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: GENERIC.common,v 1.37 2020/06/13 16:51:25 ad Exp $
 #
 #	GENERIC evbarm kernel config (template)
 #
@@ -14,7 +14,7 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 options 	NTP		# NTP phase/frequency locked loop
 
 # CPU options
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 options 	BUSDMA_COUNTERS
 
 # Architecture options
diff --git a/sys/arch/evbarm/conf/N900 b/sys/arch/evbarm/conf/N900
index 62024d981864..26f7082cc3d2 100644
--- a/sys/arch/evbarm/conf/N900
+++ b/sys/arch/evbarm/conf/N900
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: N900,v 1.34 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: N900,v 1.35 2020/06/13 16:51:25 ad Exp $
 #
 #	N900 -- Nokia N900 Kernel
 #
@@ -20,7 +20,7 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 #options 	UVMHIST,UVMHIST_PRINT
 options 	CPU_CORTEXA8
 options 	OMAP_3430
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 
 # Architecture options
 
diff --git a/sys/arch/evbarm/conf/OMAP5EVM b/sys/arch/evbarm/conf/OMAP5EVM
index 397b994f3eb2..64a2044b5145 100644
--- a/sys/arch/evbarm/conf/OMAP5EVM
+++ b/sys/arch/evbarm/conf/OMAP5EVM
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: OMAP5EVM,v 1.18 2020/05/23 14:51:49 rin Exp $
+#	$NetBSD: OMAP5EVM,v 1.19 2020/06/13 16:51:25 ad Exp $
 #
 #	OMAP5EVM -- TI OMAP 543x Eval Board Kernel
 #
@@ -19,7 +19,7 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 
 options 	CPU_CORTEXA15
 options 	OMAP_5430
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 options 	MULTIPROCESSOR
 # no options	__HAVE_MM_MD_DIRECT_MAPPED_PHYS # too much memory to direct map
 
diff --git a/sys/arch/evbarm/conf/PANDABOARD b/sys/arch/evbarm/conf/PANDABOARD
index 5f09b6da294a..04c18e6c81de 100644
--- a/sys/arch/evbarm/conf/PANDABOARD
+++ b/sys/arch/evbarm/conf/PANDABOARD
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: PANDABOARD,v 1.31 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: PANDABOARD,v 1.32 2020/06/13 16:51:25 ad Exp $
 #
 #	PANDABOARD -- TI OMAP 4430 Eval Board Kernel
 #
@@ -19,7 +19,7 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 
 options 	CPU_CORTEXA9
 options 	OMAP_4430
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 
 # Architecture options
 
diff --git a/sys/arch/evbarm/conf/PEPPER b/sys/arch/evbarm/conf/PEPPER
index da70e89dc8d6..8623bc1b9c08 100644
--- a/sys/arch/evbarm/conf/PEPPER
+++ b/sys/arch/evbarm/conf/PEPPER
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: PEPPER,v 1.15 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: PEPPER,v 1.16 2020/06/13 16:51:25 ad Exp $
 #
 #	PEPPER -- Gumstix. Inc. Pepper Single Board Computer platforms kernel
 #
@@ -17,7 +17,7 @@ maxusers	32
 options 	CPU_CORTEXA8
 options 	TI_AM335X
 options 	FPU_VFP
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 options 	ARM_HAS_VBAR
 options 	__HAVE_MM_MD_DIRECT_MAPPED_PHYS
 makeoptions	CPUFLAGS="-mcpu=cortex-a8 -mfpu=neon"
diff --git a/sys/arch/evbarm/conf/TISDP2420 b/sys/arch/evbarm/conf/TISDP2420
index 4382bdbfa905..082f4c8cd242 100644
--- a/sys/arch/evbarm/conf/TISDP2420
+++ b/sys/arch/evbarm/conf/TISDP2420
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: TISDP2420,v 1.41 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: TISDP2420,v 1.42 2020/06/13 16:51:25 ad Exp $
 #
 #	TISDP2420 -- TI OMAP 2420 Eval Board Kernel
 #
@@ -19,7 +19,7 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 
 options 	CPU_ARM1136
 options 	OMAP_2420
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 
 # Architecture options
 
diff --git a/sys/arch/evbarm/conf/VTC100 b/sys/arch/evbarm/conf/VTC100
index 33e6d18be164..40016917906c 100644
--- a/sys/arch/evbarm/conf/VTC100
+++ b/sys/arch/evbarm/conf/VTC100
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: VTC100,v 1.22 2020/04/18 11:00:38 skrll Exp $
+#	$NetBSD: VTC100,v 1.23 2020/06/13 16:51:25 ad Exp $
 #
 #	VTC100 -- NEXCOM VTC100 Kernel
 #
@@ -19,7 +19,7 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 
 options 	CPU_CORTEXA8
 options 	TI_AM335X
-options 	PMAPCOUNTERS
+#options 	PMAPCOUNTERS
 
 # XXX The Cortex PMC delay() doesn't seem to work.
 #no options	CORTEX_PMC