From a2c01344eb88dc6f74b8f411fe4db17f1f110465 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Mon, 6 Mar 2023 17:20:05 +0000
Subject: [PATCH] In iskmemdev(), do not check for the minor of /dev/io. It has
 been deprecated more than 25 years ago and removed more than 20. From Crystal
 Kolipe, thanks!

---
 sys/arch/amd64/amd64/conf.c     | 4 ++--
 sys/arch/arm64/arm64/conf.c     | 4 ++--
 sys/arch/i386/i386/conf.c       | 4 ++--
 sys/arch/riscv64/riscv64/conf.c | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 83f0089061d..f87df421880 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.77 2023/01/14 12:11:10 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.78 2023/03/06 17:20:05 miod Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -313,7 +313,7 @@ int
 iskmemdev(dev_t dev)
 {
 
-	return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14));
+	return (major(dev) == mem_no && minor(dev) < 2);
 }
 
 /*
diff --git a/sys/arch/arm64/arm64/conf.c b/sys/arch/arm64/arm64/conf.c
index 4e47542efca..e730a4b265f 100644
--- a/sys/arch/arm64/arm64/conf.c
+++ b/sys/arch/arm64/arm64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.21 2023/01/14 12:11:11 kettenis Exp $	*/
+/*	$OpenBSD: conf.c,v 1.22 2023/03/06 17:20:06 miod Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -255,7 +255,7 @@ int
 iskmemdev(dev_t dev)
 {
 
-	return (major(dev) == CMAJ_MM && (minor(dev) < 2 || minor(dev) == 14));
+	return (major(dev) == CMAJ_MM && minor(dev) < 2);
 }
 
 /*
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index dab1da63a89..6761ca19ad5 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.175 2023/01/30 10:49:04 jsg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.176 2023/03/06 17:20:06 miod Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -309,7 +309,7 @@ dev_t	swapdev = makedev(1, 0);
 int
 iskmemdev(dev_t dev)
 {
-	return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14));
+	return (major(dev) == mem_no && minor(dev) < 2);
 }
 
 /*
diff --git a/sys/arch/riscv64/riscv64/conf.c b/sys/arch/riscv64/riscv64/conf.c
index 71b2d9fb7ca..cf748881f2e 100644
--- a/sys/arch/riscv64/riscv64/conf.c
+++ b/sys/arch/riscv64/riscv64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.16 2023/01/24 13:29:51 jca Exp $	*/
+/*	$OpenBSD: conf.c,v 1.17 2023/03/06 17:20:06 miod Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -253,7 +253,7 @@ int
 iskmemdev(dev_t dev)
 {
 
-	return (major(dev) == mem_no && (minor(dev) < 2 || minor(dev) == 14));
+	return (major(dev) == mem_no && minor(dev) < 2);
 }
 
 /*
-- 
2.20.1