Index: sys/uvm/pmap/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/uvm/pmap/pmap.c,v
retrieving revision 1.24
diff -u -p -r1.24 pmap.c
--- sys/uvm/pmap/pmap.c	5 Oct 2016 20:50:00 -0000	1.24
+++ sys/uvm/pmap/pmap.c	12 Nov 2016 11:55:46 -0000
@@ -215,12 +215,14 @@ struct pmap_limits pmap_limits = {	/* VA
 	.virtual_start = VM_MIN_KERNEL_ADDRESS,
 };
 
+#if 0
 #ifdef UVMHIST
 static struct kern_history_ent pmapexechistbuf[10000];
 static struct kern_history_ent pmaphistbuf[10000];
 UVMHIST_DEFINE(pmapexechist);
 UVMHIST_DEFINE(pmaphist);
 #endif
+#endif
 
 /*
  * The pools from which pmap structures and sub-structures are allocated.
@@ -548,8 +550,10 @@ pmap_steal_memory(vsize_t size, vaddr_t 
 void
 pmap_init(void)
 {
+#if 0
 	UVMHIST_INIT_STATIC(pmapexechist, pmapexechistbuf);
 	UVMHIST_INIT_STATIC(pmaphist, pmaphistbuf);
+#endif
 
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(pmaphist);
 
Index: sys/uvm/pmap/pmap.h
===================================================================
RCS file: /cvsroot/src/sys/uvm/pmap/pmap.h,v
retrieving revision 1.7
diff -u -p -r1.7 pmap.h
--- sys/uvm/pmap/pmap.h	11 Jul 2016 16:06:09 -0000	1.7
+++ sys/uvm/pmap/pmap.h	12 Nov 2016 11:55:46 -0000
@@ -75,10 +75,15 @@
 #define	_COMMON_PMAP_H_
 
 #include <uvm/uvm_stat.h>
+#if 0
 #ifdef UVMHIST
 UVMHIST_DECL(pmapexechist);
 UVMHIST_DECL(pmaphist);
 #endif
+#endif
+UVMHIST_DECL(maphist);
+#define pmaphist maphist
+#define pmapexechist maphist
 
 /*
  * The user address space is mapped using a two level structure where