Index: sys/conf/files
===================================================================
RCS file: /cvsroot/src/sys/conf/files,v
retrieving revision 1.1266
diff -p -u -r1.1266 files
--- sys/conf/files	22 Apr 2020 09:15:40 -0000	1.1266
+++ sys/conf/files	19 May 2020 03:47:05 -0000
@@ -1,7 +1,7 @@
 #	$NetBSD: files,v 1.1266 2020/04/22 09:15:40 rin Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
-version 	20171118
+version 	20200506
 
 #
 # device classes
Index: sys/kern/kern_veriexec.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_veriexec.c,v
retrieving revision 1.23
diff -p -u -r1.23 kern_veriexec.c
--- sys/kern/kern_veriexec.c	21 Feb 2020 00:26:22 -0000	1.23
+++ sys/kern/kern_veriexec.c	19 May 2020 03:47:05 -0000
@@ -936,7 +936,7 @@ veriexec_raw_cb(kauth_cred_t cred, kauth
 		vp = arg1;
 		KASSERT(vp != NULL);
 
-		/* Handle /dev/mem and /dev/kmem. */
+		/* Handle kernel memory files. */
 		if (iskmemvp(vp)) {
 			if (veriexec_strict < VERIEXEC_IPS)
 				result = KAUTH_RESULT_DEFER;
Index: sys/miscfs/specfs/spec_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/miscfs/specfs/spec_vnops.c,v
retrieving revision 1.178
diff -p -u -r1.178 spec_vnops.c
--- sys/miscfs/specfs/spec_vnops.c	16 May 2020 18:31:51 -0000	1.178
+++ sys/miscfs/specfs/spec_vnops.c	19 May 2020 03:47:05 -0000
@@ -178,11 +178,16 @@ iskmemvp(struct vnode *vp)
 int
 iskmemdev(dev_t dev)
 {
-	/* mem_no is emitted by config(8) to generated devsw.c */
+	/* mem_no/rswapdev are emitted by config(8) to generated devsw.c */
 	extern const int mem_no;
+	extern const dev_t rswapdev;
 
-	/* minor 14 is /dev/io on i386 with COMPAT_10 */
-	return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14));
+	/*
+	 * /dev/kmem and /dev/mem are are minor 0 and 1.  minor 14 is /dev/io
+	 * on i386 with COMPAT_10.
+	 */
+	return (major(dev) == major(rswapdev) ||
+		(major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14)));
 }
 
 static int
Index: sys/rump/librump/rumpkern/emul.c
===================================================================
RCS file: /cvsroot/src/sys/rump/librump/rumpkern/emul.c,v
retrieving revision 1.196
diff -p -u -r1.196 emul.c
--- sys/rump/librump/rumpkern/emul.c	30 Apr 2020 03:28:19 -0000	1.196
+++ sys/rump/librump/rumpkern/emul.c	19 May 2020 03:47:05 -0000
@@ -80,6 +80,7 @@ const int sys_bdevsws = 255;
 int max_bdevsws = 255;
 
 int mem_no = 2;
+dev_t rswapdev = NODEV;
 
 device_t booted_device;
 device_t booted_wedge;
Index: sys/secmodel/securelevel/secmodel_securelevel.c
===================================================================
RCS file: /cvsroot/src/sys/secmodel/securelevel/secmodel_securelevel.c,v
retrieving revision 1.35
diff -p -u -r1.35 secmodel_securelevel.c
--- sys/secmodel/securelevel/secmodel_securelevel.c	11 May 2020 19:36:39 -0000	1.35
+++ sys/secmodel/securelevel/secmodel_securelevel.c	19 May 2020 03:47:05 -0000
@@ -522,7 +522,7 @@ secmodel_securelevel_device_cb(kauth_cre
 
 		KASSERT(vp != NULL);
 
-		/* Handle /dev/mem and /dev/kmem. */
+		/* Handle kernel memory files. */
 		if (iskmemvp(vp)) {
 			switch (req) {
 			case KAUTH_REQ_DEVICE_RAWIO_SPEC_READ:
Index: usr.bin/config/defs.h
===================================================================
RCS file: /cvsroot/src/usr.bin/config/defs.h,v
retrieving revision 1.106
diff -p -u -r1.106 defs.h
--- usr.bin/config/defs.h	3 Apr 2020 19:53:41 -0000	1.106
+++ usr.bin/config/defs.h	19 May 2020 03:47:06 -0000
@@ -107,7 +107,7 @@ extern const char *progname;
  * The next two lines define the current version of the config(1) binary,
  * and the minimum version of the configuration files it supports.
  */
-#define CONFIG_VERSION		20180827
+#define CONFIG_VERSION		20200506
 #define CONFIG_MINVERSION	0
 
 struct where {
Index: usr.bin/config/mkdevsw.c
===================================================================
RCS file: /cvsroot/src/usr.bin/config/mkdevsw.c,v
retrieving revision 1.15
diff -p -u -r1.15 mkdevsw.c
--- usr.bin/config/mkdevsw.c	16 Jul 2016 07:13:26 -0000	1.15
+++ usr.bin/config/mkdevsw.c	19 May 2020 03:47:06 -0000
@@ -228,7 +228,10 @@ emitdev(FILE *fp)
 	if ((dm = ht_lookup(bdevmtab, intern(mstr))) != NULL) {
 		fprintf(fp, "const dev_t swapdev = makedev(%d, 0);\n",
 			    dm->dm_bmajor);
-	}
+		fprintf(fp, "const dev_t rswapdev = makedev(%d, 0);\n",
+			    dm->dm_cmajor);
+	} else
+		fprintf(fp, "const dev_t rswapdev = NODEV;\n");
 
 	(void)strlcpy(mstr, "mem", sizeof(mstr));
 	if ((dm = ht_lookup(cdevmtab, intern(mstr))) == NULL)