sync

14 files changed, 185 insertions, 65 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index f2cb80781ad..379384c7558 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1819,19 +1819,16 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/vm
-./usr/libdata/perl5/site_perl/alpha-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/xfs
 ./usr/libdata/perl5/site_perl/alpha-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 0887057d4d9..ae6e5e4facb 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1852,19 +1852,16 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 24e43a74ebf..75891f6fa4d 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1849,19 +1849,16 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 4790480dee9..b139e6df591 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1840,19 +1840,16 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/vm
-./usr/libdata/perl5/site_perl/i386-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/xfs
 ./usr/libdata/perl5/site_perl/i386-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index fedb3a3b630..6cb1793bbe6 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1845,19 +1845,16 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 06e1b0a7d02..cd77c67946f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1864,19 +1864,16 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/xfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index b6d7c130d4c..fcc2e7e511c 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1850,19 +1850,16 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index c690276c2f7..fdbee920a64 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -577,6 +577,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/timeout.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/termcap.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/uvm
+./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_param.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pmap.ph
 ./usr/m88k-unknown-openbsd3.0
 ./usr/m88k-unknown-openbsd3.0/bin
 ./usr/m88k-unknown-openbsd3.0/lib
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 8e77ef3ec09..d25cc7275f9 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1812,19 +1812,16 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/xfs
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 935464999d1..60fff0189a2 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1495,19 +1495,16 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/vm
-./usr/libdata/perl5/site_perl/sparc-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/xfs
 ./usr/libdata/perl5/site_perl/sparc-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 4cfdcc3bf51..b5dc24f5319 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1472,19 +1472,16 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/vm
-./usr/libdata/perl5/site_perl/sparc64-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/xfs
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index eefadc61f1a..a8882d36c91 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1864,19 +1864,16 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_swap_encrypt.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_vnode.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 9f4fd75ed12..c5b043a8680 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1380,8 +1380,10 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pager.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pager_i.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pglist.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pmap.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_stat.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_swap.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_swap_encrypt.ph
@@ -1443,11 +1445,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/vmparam.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/vsbus.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vis.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/vm
-./usr/libdata/perl5/site_perl/vax-openbsd/vm/pmap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/vm/vm.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/vm/vm_page.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/vm/vm_param.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/xfs
 ./usr/libdata/perl5/site_perl/vax-openbsd/xfs/nxfs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/xfs/xfs_attr.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 8a234bbfcd5..6317ec3f59b 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1451,19 +1451,16 @@
 ./usr/include/uvm/uvm_page_i.h
 ./usr/include/uvm/uvm_pager.h
 ./usr/include/uvm/uvm_pager_i.h
+./usr/include/uvm/uvm_param.h
 ./usr/include/uvm/uvm_pdaemon.h
 ./usr/include/uvm/uvm_pglist.h
+./usr/include/uvm/uvm_pmap.h
 ./usr/include/uvm/uvm_stat.h
 ./usr/include/uvm/uvm_swap.h
 ./usr/include/uvm/uvm_swap_encrypt.h
 ./usr/include/uvm/uvm_vnode.h
 ./usr/include/varargs.h
 ./usr/include/vis.h
-./usr/include/vm
-./usr/include/vm/pmap.h
-./usr/include/vm/vm.h
-./usr/include/vm/vm_page.h
-./usr/include/vm/vm_param.h
 ./usr/include/xfs
 ./usr/include/xfs/nxfs.h
 ./usr/include/xfs/xfs_attr.h
@@ -2189,6 +2186,7 @@
 ./usr/share/man/cat3/OpenSSL_add_all_algorithms.0
 ./usr/share/man/cat3/OpenSSL_add_all_ciphers.0
 ./usr/share/man/cat3/OpenSSL_add_all_digests.0
+./usr/share/man/cat3/OpenSSL_add_ssl_algorithms.0
 ./usr/share/man/cat3/PAIR_NUMBER.0
 ./usr/share/man/cat3/RAND_SSLeay.0
 ./usr/share/man/cat3/RAND_add.0
@@ -2297,9 +2295,162 @@
 ./usr/share/man/cat3/SLIST_INSERT_HEAD.0
 ./usr/share/man/cat3/SLIST_NEXT.0
 ./usr/share/man/cat3/SLIST_REMOVE_HEAD.0
+./usr/share/man/cat3/SSL_CIPHER_description.0
+./usr/share/man/cat3/SSL_CIPHER_get_bits.0
+./usr/share/man/cat3/SSL_CIPHER_get_name.0
+./usr/share/man/cat3/SSL_CIPHER_get_version.0
+./usr/share/man/cat3/SSL_CTX_add_client_CA.0
+./usr/share/man/cat3/SSL_CTX_add_extra_chain_cert.0
+./usr/share/man/cat3/SSL_CTX_add_session.0
+./usr/share/man/cat3/SSL_CTX_check_private_key.0
+./usr/share/man/cat3/SSL_CTX_flush_sessions.0
+./usr/share/man/cat3/SSL_CTX_free.0
+./usr/share/man/cat3/SSL_CTX_get_client_CA_list.0
+./usr/share/man/cat3/SSL_CTX_get_ex_data.0
+./usr/share/man/cat3/SSL_CTX_get_ex_new_index.0
+./usr/share/man/cat3/SSL_CTX_get_mode.0
+./usr/share/man/cat3/SSL_CTX_get_options.0
+./usr/share/man/cat3/SSL_CTX_get_session_cache_mode.0
+./usr/share/man/cat3/SSL_CTX_get_timeout.0
+./usr/share/man/cat3/SSL_CTX_get_verify_callback.0
+./usr/share/man/cat3/SSL_CTX_get_verify_depth.0
+./usr/share/man/cat3/SSL_CTX_get_verify_mode.0
+./usr/share/man/cat3/SSL_CTX_load_verify_locations.0
+./usr/share/man/cat3/SSL_CTX_new.0
+./usr/share/man/cat3/SSL_CTX_remove_session.0
+./usr/share/man/cat3/SSL_CTX_sess_accept.0
+./usr/share/man/cat3/SSL_CTX_sess_accept_good.0
+./usr/share/man/cat3/SSL_CTX_sess_accept_renegotiate.0
+./usr/share/man/cat3/SSL_CTX_sess_cache_full.0
+./usr/share/man/cat3/SSL_CTX_sess_cb_hits.0
+./usr/share/man/cat3/SSL_CTX_sess_connect.0
+./usr/share/man/cat3/SSL_CTX_sess_connect_good.0
+./usr/share/man/cat3/SSL_CTX_sess_connect_renegotiate.0
+./usr/share/man/cat3/SSL_CTX_sess_get_cache_size.0
+./usr/share/man/cat3/SSL_CTX_sess_get_get_cb.0
+./usr/share/man/cat3/SSL_CTX_sess_get_new_cb.0
+./usr/share/man/cat3/SSL_CTX_sess_get_remove_cb.0
+./usr/share/man/cat3/SSL_CTX_sess_hits.0
+./usr/share/man/cat3/SSL_CTX_sess_misses.0
+./usr/share/man/cat3/SSL_CTX_sess_number.0
+./usr/share/man/cat3/SSL_CTX_sess_set_cache_size.0
+./usr/share/man/cat3/SSL_CTX_sess_set_get_cb.0
+./usr/share/man/cat3/SSL_CTX_sess_set_new_cb.0
+./usr/share/man/cat3/SSL_CTX_sess_set_remove.0
+./usr/share/man/cat3/SSL_CTX_sess_timeouts.0
+./usr/share/man/cat3/SSL_CTX_sessions.0
+./usr/share/man/cat3/SSL_CTX_set_cipher_list.0
+./usr/share/man/cat3/SSL_CTX_set_client_CA_list.0
+./usr/share/man/cat3/SSL_CTX_set_default_passwd_cb.0
+./usr/share/man/cat3/SSL_CTX_set_default_passwd_cb_userdata.0
+./usr/share/man/cat3/SSL_CTX_set_ex_data.0
+./usr/share/man/cat3/SSL_CTX_set_mode.0
+./usr/share/man/cat3/SSL_CTX_set_options.0
+./usr/share/man/cat3/SSL_CTX_set_session_cache_mode.0
+./usr/share/man/cat3/SSL_CTX_set_session_id_context.0
+./usr/share/man/cat3/SSL_CTX_set_ssl_version.0
+./usr/share/man/cat3/SSL_CTX_set_timeout.0
+./usr/share/man/cat3/SSL_CTX_set_verify.0
+./usr/share/man/cat3/SSL_CTX_set_verify_depth.0
+./usr/share/man/cat3/SSL_CTX_use_PrivateKey.0
+./usr/share/man/cat3/SSL_CTX_use_PrivateKey_ASN1.0
+./usr/share/man/cat3/SSL_CTX_use_PrivateKey_file.0
+./usr/share/man/cat3/SSL_CTX_use_RSAPrivateKey.0
+./usr/share/man/cat3/SSL_CTX_use_RSAPrivateKey_ASN1.0
+./usr/share/man/cat3/SSL_CTX_use_RSAPrivateKey_file.0
+./usr/share/man/cat3/SSL_CTX_use_certificate.0
+./usr/share/man/cat3/SSL_CTX_use_certificate_ASN1.0
+./usr/share/man/cat3/SSL_CTX_use_certificate_chain_file.0
+./usr/share/man/cat3/SSL_CTX_use_certificate_file.0
+./usr/share/man/cat3/SSL_SESSION_free.0
+./usr/share/man/cat3/SSL_SESSION_get_ex_data.0
+./usr/share/man/cat3/SSL_SESSION_get_ex_new_index.0
+./usr/share/man/cat3/SSL_SESSION_get_time.0
+./usr/share/man/cat3/SSL_SESSION_get_timeout.0
+./usr/share/man/cat3/SSL_SESSION_set_ex_data.0
+./usr/share/man/cat3/SSL_SESSION_set_time.0
+./usr/share/man/cat3/SSL_SESSION_set_timeout.0
+./usr/share/man/cat3/SSL_accept.0
+./usr/share/man/cat3/SSL_add_client_CA.0
+./usr/share/man/cat3/SSL_add_session.0
+./usr/share/man/cat3/SSL_check_private_key.0
+./usr/share/man/cat3/SSL_clear.0
+./usr/share/man/cat3/SSL_connect.0
+./usr/share/man/cat3/SSL_flush_sessions.0
+./usr/share/man/cat3/SSL_free.0
+./usr/share/man/cat3/SSL_get0_session.0
+./usr/share/man/cat3/SSL_get1_session.0
+./usr/share/man/cat3/SSL_get_cipher.0
+./usr/share/man/cat3/SSL_get_cipher_bits.0
+./usr/share/man/cat3/SSL_get_cipher_list.0
+./usr/share/man/cat3/SSL_get_cipher_name.0
+./usr/share/man/cat3/SSL_get_cipher_version.0
+./usr/share/man/cat3/SSL_get_ciphers.0
+./usr/share/man/cat3/SSL_get_client_CA_list.0
+./usr/share/man/cat3/SSL_get_current_cipher.0
 ./usr/share/man/cat3/SSL_get_error.0
+./usr/share/man/cat3/SSL_get_ex_data.0
+./usr/share/man/cat3/SSL_get_ex_data_X509_STORE_CTX_idx.0
+./usr/share/man/cat3/SSL_get_ex_new_index.0
+./usr/share/man/cat3/SSL_get_fd.0
+./usr/share/man/cat3/SSL_get_mode.0
+./usr/share/man/cat3/SSL_get_options.0
+./usr/share/man/cat3/SSL_get_peer_cert_chain.0
+./usr/share/man/cat3/SSL_get_peer_certificate.0
+./usr/share/man/cat3/SSL_get_rbio.0
+./usr/share/man/cat3/SSL_get_rfd.0
+./usr/share/man/cat3/SSL_get_session.0
+./usr/share/man/cat3/SSL_get_shutdown.0
+./usr/share/man/cat3/SSL_get_ssl_method.0
+./usr/share/man/cat3/SSL_get_time.0
+./usr/share/man/cat3/SSL_get_timeout.0
+./usr/share/man/cat3/SSL_get_verify_callback.0
+./usr/share/man/cat3/SSL_get_verify_depth.0
+./usr/share/man/cat3/SSL_get_verify_mode.0
+./usr/share/man/cat3/SSL_get_verify_result.0
+./usr/share/man/cat3/SSL_get_version.0
+./usr/share/man/cat3/SSL_get_wbio.0
+./usr/share/man/cat3/SSL_get_wfd.0
+./usr/share/man/cat3/SSL_library_init.0
+./usr/share/man/cat3/SSL_load_client_CA_file.0
 ./usr/share/man/cat3/SSL_load_error_strings.0
+./usr/share/man/cat3/SSL_new.0
+./usr/share/man/cat3/SSL_pending.0
+./usr/share/man/cat3/SSL_read.0
+./usr/share/man/cat3/SSL_remove_session.0
+./usr/share/man/cat3/SSL_set_accept_state.0
+./usr/share/man/cat3/SSL_set_bio.0
+./usr/share/man/cat3/SSL_set_cipher_list.0
+./usr/share/man/cat3/SSL_set_client_CA_list.0
+./usr/share/man/cat3/SSL_set_connect_state.0
+./usr/share/man/cat3/SSL_set_ex_data.0
+./usr/share/man/cat3/SSL_set_fd.0
+./usr/share/man/cat3/SSL_set_mode.0
+./usr/share/man/cat3/SSL_set_options.0
+./usr/share/man/cat3/SSL_set_rfd.0
+./usr/share/man/cat3/SSL_set_session.0
+./usr/share/man/cat3/SSL_set_session_id_context.0
+./usr/share/man/cat3/SSL_set_shutdown.0
+./usr/share/man/cat3/SSL_set_ssl_method.0
+./usr/share/man/cat3/SSL_set_time.0
+./usr/share/man/cat3/SSL_set_timeout.0
+./usr/share/man/cat3/SSL_set_verify.0
+./usr/share/man/cat3/SSL_set_verify_depth.0
+./usr/share/man/cat3/SSL_set_verify_result.0
+./usr/share/man/cat3/SSL_set_wfd.0
+./usr/share/man/cat3/SSL_shutdown.0
+./usr/share/man/cat3/SSL_use_PrivateKey.0
+./usr/share/man/cat3/SSL_use_PrivateKey_ASN1.0
+./usr/share/man/cat3/SSL_use_PrivateKey_file.0
+./usr/share/man/cat3/SSL_use_RSAPrivateKey.0
+./usr/share/man/cat3/SSL_use_RSAPrivateKey_ASN1.0
+./usr/share/man/cat3/SSL_use_RSAPrivateKey_file.0
+./usr/share/man/cat3/SSL_use_certificate.0
+./usr/share/man/cat3/SSL_use_certificate_ASN1.0
+./usr/share/man/cat3/SSL_use_certificate_file.0
+./usr/share/man/cat3/SSL_write.0
 ./usr/share/man/cat3/SSLeay.0
+./usr/share/man/cat3/SSLeay_add_ssl_algorithms.0
 ./usr/share/man/cat3/SSLeay_version.0
 ./usr/share/man/cat3/TAILQ_EMPTY.0
 ./usr/share/man/cat3/TAILQ_END.0
@@ -2617,6 +2768,7 @@
 ./usr/share/man/cat3/d2i_Netscape_RSA.0
 ./usr/share/man/cat3/d2i_RSAPrivateKey.0
 ./usr/share/man/cat3/d2i_RSAPublicKey.0
+./usr/share/man/cat3/d2i_SSL_SESSION.0
 ./usr/share/man/cat3/daemon.0
 ./usr/share/man/cat3/data_ahead.0
 ./usr/share/man/cat3/data_behind.0
@@ -3017,6 +3169,7 @@
 ./usr/share/man/cat3/i2d_Netscape_RSA.0
 ./usr/share/man/cat3/i2d_RSAPrivateKey.0
 ./usr/share/man/cat3/i2d_RSAPublicKey.0
+./usr/share/man/cat3/i2d_SSL_SESSION.0
 ./usr/share/man/cat3/idcok.0
 ./usr/share/man/cat3/idlok.0
 ./usr/share/man/cat3/ieee.0