From 68b8e131484f8a1ad024396b66acaf02e1e441e4 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 27 Jan 2018 22:55:23 +0000
Subject: [PATCH] Sync the nam2blk entries with the bdevsw table, which is the
 definitive list of block devices supported on an architecture. ok kettenis@
 deraadt@

---
 sys/arch/alpha/alpha/autoconf.c       |  5 ++---
 sys/arch/arm64/arm64/autoconf.c       | 12 ++++++------
 sys/arch/armv7/armv7/autoconf.c       |  5 +++--
 sys/arch/hppa/hppa/autoconf.c         |  5 ++---
 sys/arch/i386/i386/autoconf.c         |  4 ++--
 sys/arch/landisk/landisk/autoconf.c   |  5 +++--
 sys/arch/loongson/loongson/autoconf.c |  4 ++--
 sys/arch/luna88k/luna88k/autoconf.c   |  5 +++--
 sys/arch/macppc/macppc/autoconf.c     |  7 ++++---
 sys/arch/octeon/octeon/autoconf.c     |  4 ++--
 sys/arch/sgi/sgi/autoconf.c           |  5 +++--
 sys/arch/socppc/socppc/autoconf.c     |  5 +++--
 sys/arch/sparc64/sparc64/autoconf.c   |  7 ++++---
 13 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index 300f7b90457..cc8c989a0fd 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.37 2017/06/05 17:49:05 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.38 2018/01/27 22:55:23 naddy Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $	*/
 
 /*
@@ -221,12 +221,11 @@ device_register(dev, aux)
 }
 
 struct nam2blk nam2blk[] = {
-	{ "st",		2 },
+	{ "wd",		0 },
 	{ "cd",		3 },
 	{ "fd",		4 },
 	{ "rd",		6 },
 	{ "sd",		8 },
-	{ "wd",		0 },
 	{ "vnd",	9 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/arm64/arm64/autoconf.c b/sys/arch/arm64/arm64/autoconf.c
index f1491ed210e..ad507aea8c7 100644
--- a/sys/arch/arm64/arm64/autoconf.c
+++ b/sys/arch/arm64/arm64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.7 2018/01/20 18:35:41 kettenis Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.8 2018/01/27 22:55:23 naddy Exp $	*/
 /*
  * Copyright (c) 2009 Miodrag Vallat.
  *
@@ -96,10 +96,10 @@ device_register(struct device *dev, void *aux)
 }
 
 struct nam2blk nam2blk[] = {
-	{ "sd",		4 },
-	{ "nbd",	20 },
-	{ "tmpfsrd",	19 },
-	{ "cd",		6},
-	{ "wd",		0 },
+	{ "wd",		 0 },
+	{ "sd",		 4 },
+	{ "cd",		 6 },
+	{ "vnd",	14 },
+	{ "rd",		17 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/armv7/armv7/autoconf.c b/sys/arch/armv7/armv7/autoconf.c
index 5865e40d4f8..9507f7569b9 100644
--- a/sys/arch/armv7/armv7/autoconf.c
+++ b/sys/arch/armv7/armv7/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.6 2016/06/08 17:24:44 tedu Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.7 2018/01/27 22:55:23 naddy Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -137,9 +137,10 @@ diskconf(void)
 
 struct nam2blk nam2blk[] = {
 	{ "wd",		16 },
+	{ "rd",		18 },
+	} "vnd",	19 },
 	{ "sd",		24 },
 	{ "cd",		26 },
-	{ "rd",		18 },
 	{ NULL,		-1 }
 };
 
diff --git a/sys/arch/hppa/hppa/autoconf.c b/sys/arch/hppa/hppa/autoconf.c
index 13f389065fc..0ee7b9066c2 100644
--- a/sys/arch/hppa/hppa/autoconf.c
+++ b/sys/arch/hppa/hppa/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.61 2014/09/15 19:08:21 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.62 2018/01/27 22:55:23 naddy Exp $	*/
 
 /*
  * Copyright (c) 1998-2003 Michael Shalayeff
@@ -512,12 +512,11 @@ diskconf(void)
 }
 
 struct nam2blk nam2blk[] = {
+	{ "vnd",	2 },
 	{ "rd",		3 },
 	{ "sd",		4 },
-	{ "st",		5 },
 	{ "cd",		6 },
 	{ "fd",		7 },
 	{ "wd",		8 },
-	{ "vnd",	2 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 012bf27d13f..865ac115e48 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.103 2017/06/20 21:05:46 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.104 2018/01/27 22:55:23 naddy Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -270,7 +270,7 @@ struct nam2blk nam2blk[] = {
 	{ "fd",		2 },
 	{ "sd",		4 },
 	{ "cd",		6 },
-	{ "rd",		17 },
 	{ "vnd",	14 },
+	{ "rd",		17 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/landisk/landisk/autoconf.c b/sys/arch/landisk/landisk/autoconf.c
index 1448b868ee8..2b756bf4365 100644
--- a/sys/arch/landisk/landisk/autoconf.c
+++ b/sys/arch/landisk/landisk/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.11 2008/07/21 04:35:54 todd Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.12 2018/01/27 22:55:23 naddy Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -76,7 +76,8 @@ diskconf(void)
 struct nam2blk nam2blk[] = {
 	{ "wd",		16 },
 	{ "rd",		18 },
-	{ "sd",		24 },
 	{ "vnd",	19 },
+	{ "sd",		24 },
+	{ "cd",		26 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/loongson/loongson/autoconf.c b/sys/arch/loongson/loongson/autoconf.c
index 1a434a81025..7351703ddf5 100644
--- a/sys/arch/loongson/loongson/autoconf.c
+++ b/sys/arch/loongson/loongson/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.8 2017/06/08 12:02:52 visa Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.9 2018/01/27 22:55:23 naddy Exp $	*/
 /*
  * Copyright (c) 2009 Miodrag Vallat.
  *
@@ -113,9 +113,9 @@ device_register(struct device *dev, void *aux)
 
 struct nam2blk nam2blk[] = {
 	{ "sd",		0 },
+	{ "vnd",	2 },
 	{ "cd",		3 },
 	{ "wd",		4 },
 	{ "rd",		8 },
-	{ "vnd",	2 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/luna88k/luna88k/autoconf.c b/sys/arch/luna88k/luna88k/autoconf.c
index 19c0cb79f3c..1dcbf5171ff 100644
--- a/sys/arch/luna88k/luna88k/autoconf.c
+++ b/sys/arch/luna88k/luna88k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.22 2017/11/03 09:07:54 aoyama Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.23 2018/01/27 22:55:23 naddy Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -179,8 +179,9 @@ device_register(struct device *dev, void *aux)
 
 struct nam2blk nam2blk[] = {
 	{ "sd",		4 },
-	{ "st",		5 },
+	{ "cd",		6 },
 	{ "rd",		7 },
 	{ "vnd",	8 },
+	{ "wd",		9 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c
index 769247b8c30..6d887b9ee42 100644
--- a/sys/arch/macppc/macppc/autoconf.c
+++ b/sys/arch/macppc/macppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.44 2016/06/08 17:24:44 tedu Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.45 2018/01/27 22:55:23 naddy Exp $	*/
 /*
  * Copyright (c) 1996, 1997 Per Fogelstrom
  * Copyright (c) 1995 Theo de Raadt
@@ -37,7 +37,7 @@
  * from: Utah Hdr: autoconf.c 1.31 91/01/21
  *
  *	from: @(#)autoconf.c	8.1 (Berkeley) 6/10/93
- *      $Id: autoconf.c,v 1.44 2016/06/08 17:24:44 tedu Exp $
+ *      $Id: autoconf.c,v 1.45 2018/01/27 22:55:23 naddy Exp $
  */
 
 /*
@@ -283,7 +283,8 @@ diskconf(void)
 struct nam2blk nam2blk[] = {
 	{ "wd",		0 },
 	{ "sd",		2 },
-	{ "rd",		17 },
+	{ "cd",		3 },
 	{ "vnd",	14 },
+	{ "rd",		17 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/octeon/octeon/autoconf.c b/sys/arch/octeon/octeon/autoconf.c
index 43e4960644a..d61eddc207d 100644
--- a/sys/arch/octeon/octeon/autoconf.c
+++ b/sys/arch/octeon/octeon/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.12 2017/06/08 12:02:52 visa Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.13 2018/01/27 22:55:23 naddy Exp $	*/
 /*
  * Copyright (c) 2009 Miodrag Vallat.
  *
@@ -136,10 +136,10 @@ device_register(struct device *dev, void *aux)
 
 struct nam2blk nam2blk[] = {
 	{ "sd",		0 },
+	{ "vnd",	2 },
 	{ "cd",		3 },
 	{ "wd",		4 },
 	{ "rd",		8 },
-	{ "vnd",	2 },
 	{ "octcf",	15 },
 	{ "amdcf",	19 },
 	{ NULL,		-1 }
diff --git a/sys/arch/sgi/sgi/autoconf.c b/sys/arch/sgi/sgi/autoconf.c
index 928297219b2..55e24fec74c 100644
--- a/sys/arch/sgi/sgi/autoconf.c
+++ b/sys/arch/sgi/sgi/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.42 2017/06/08 12:02:52 visa Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.43 2018/01/27 22:55:23 naddy Exp $	*/
 /*
  * Copyright (c) 2009, 2010 Miodrag Vallat.
  *
@@ -727,9 +727,10 @@ dksc_device_register(struct device *dev, void *aux)
 
 struct nam2blk nam2blk[] = {
 	{ "sd",		0 },
+	{ "vnd",	2 },
+	{ "cd",		3 },
 	{ "wd",		4 },
 	{ "rd",		8 },
-	{ "vnd",	2 },
 	{ NULL,		-1 }
 };
 
diff --git a/sys/arch/socppc/socppc/autoconf.c b/sys/arch/socppc/socppc/autoconf.c
index 122585a80cd..e17968b7de8 100644
--- a/sys/arch/socppc/socppc/autoconf.c
+++ b/sys/arch/socppc/socppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.6 2016/06/08 17:24:44 tedu Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.7 2018/01/27 22:55:23 naddy Exp $	*/
 
 /*
  * Copyright (c) 2008 Mark Kettenis
@@ -67,7 +67,8 @@ diskconf(void)
 struct nam2blk nam2blk[] = {
 	{ "wd",		0 },
 	{ "sd",		2 },
-	{ "rd",		17 },
+	{ "cd",		3 },
 	{ "vnd",	14 },
+	{ "rd",		17 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index b9e92593c2a..b4cc09afd45 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.130 2017/12/13 00:12:03 dlg Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.131 2018/01/27 22:55:23 naddy Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
 
 /*
@@ -1514,10 +1514,11 @@ nail_bootdev(struct device *dev, struct bootpath *bp)
 }
 
 struct nam2blk nam2blk[] = {
-	{ "sd",		 7 },
 	{ "rd",		 5 },
+	{ "sd",		 7 },
+	{ "vnd",	 8 },
 	{ "wd",		12 },
+	{ "fd",		16 },
 	{ "cd",		18 },
-	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
-- 
2.20.1