Module Name: src
Committed By: thorpej
Date: Sun Mar 31 19:06:31 UTC 2024
Modified Files:
src/sys/arch/alpha/alpha: api_up1000.c autoconf.c dec_1000a.c
dec_2000_300.c dec_2100_a50.c dec_2100_a500.c dec_3000_300.c
dec_3000_500.c dec_550.c dec_6600.c dec_alphabook1.c
dec_axppci_33.c dec_eb164.c dec_eb64plus.c dec_eb66.c dec_kn20aa.c
dec_kn300.c dec_kn8ae.c
Log Message:
Always call platform.device_register(), even if bootdev_data is NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/alpha/alpha/api_up1000.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/alpha/alpha/autoconf.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/alpha/alpha/dec_1000a.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/alpha/alpha/dec_2000_300.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/alpha/alpha/dec_2100_a50.c \
src/sys/arch/alpha/alpha/dec_axppci_33.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/alpha/dec_2100_a500.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/alpha/alpha/dec_3000_300.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/alpha/alpha/dec_3000_500.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/alpha/dec_550.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/alpha/dec_6600.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/alpha/dec_alphabook1.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/alpha/alpha/dec_eb164.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/alpha/alpha/dec_eb64plus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/alpha/dec_eb66.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/alpha/alpha/dec_kn20aa.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/alpha/alpha/dec_kn300.c \
src/sys/arch/alpha/alpha/dec_kn8ae.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/api_up1000.c
diff -u src/sys/arch/alpha/alpha/api_up1000.c:1.32 src/sys/arch/alpha/alpha/api_up1000.c:1.33
--- src/sys/arch/alpha/alpha/api_up1000.c:1.32 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/api_up1000.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: api_up1000.c,v 1.32 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: api_up1000.c,v 1.33 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.32 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.33 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -178,7 +178,7 @@ api_up1000_device_register(device_t dev,
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/autoconf.c
diff -u src/sys/arch/alpha/alpha/autoconf.c:1.58 src/sys/arch/alpha/alpha/autoconf.c:1.59
--- src/sys/arch/alpha/alpha/autoconf.c:1.58 Fri Jul 9 01:29:20 2021
+++ src/sys/arch/alpha/alpha/autoconf.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.58 2021/07/09 01:29:20 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.59 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.58 2021/07/09 01:29:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.59 2024/03/31 19:06:30 thorpej Exp $");
#include "pci.h"
@@ -324,13 +324,6 @@ device_register(device_t dev, void *aux)
if (parent != NULL && device_is_a(parent, "pci"))
device_pci_register(dev, aux);
#endif
-
- if (bootdev_data == NULL) {
- /*
- * There is no hope.
- */
- return;
- }
if (platform.device_register)
(*platform.device_register)(dev, aux);
}
Index: src/sys/arch/alpha/alpha/dec_1000a.c
diff -u src/sys/arch/alpha/alpha/dec_1000a.c:1.34 src/sys/arch/alpha/alpha/dec_1000a.c:1.35
--- src/sys/arch/alpha/alpha/dec_1000a.c:1.34 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_1000a.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_1000a.c,v 1.34 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_1000a.c,v 1.35 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.34 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.35 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -254,7 +254,7 @@ dec_1000a_device_register(device_t dev,
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_2000_300.c
diff -u src/sys/arch/alpha/alpha/dec_2000_300.c:1.21 src/sys/arch/alpha/alpha/dec_2000_300.c:1.22
--- src/sys/arch/alpha/alpha/dec_2000_300.c:1.21 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_2000_300.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2000_300.c,v 1.21 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_2000_300.c,v 1.22 2024/03/31 19:06:30 thorpej Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2000_300.c,v 1.21 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2000_300.c,v 1.22 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -204,7 +204,7 @@ dec_2000_300_device_register(device_t de
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_2100_a50.c
diff -u src/sys/arch/alpha/alpha/dec_2100_a50.c:1.69 src/sys/arch/alpha/alpha/dec_2100_a50.c:1.70
--- src/sys/arch/alpha/alpha/dec_2100_a50.c:1.69 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_2100_a50.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2100_a50.c,v 1.69 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_2100_a50.c,v 1.70 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.69 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.70 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -203,7 +203,7 @@ dec_2100_a50_device_register(device_t de
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_axppci_33.c
diff -u src/sys/arch/alpha/alpha/dec_axppci_33.c:1.69 src/sys/arch/alpha/alpha/dec_axppci_33.c:1.70
--- src/sys/arch/alpha/alpha/dec_axppci_33.c:1.69 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_axppci_33.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_axppci_33.c,v 1.69 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_axppci_33.c,v 1.70 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.69 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.70 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,7 +227,7 @@ dec_axppci_33_device_register(device_t d
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_2100_a500.c
diff -u src/sys/arch/alpha/alpha/dec_2100_a500.c:1.25 src/sys/arch/alpha/alpha/dec_2100_a500.c:1.26
--- src/sys/arch/alpha/alpha/dec_2100_a500.c:1.25 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_2100_a500.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2100_a500.c,v 1.25 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_2100_a500.c,v 1.26 2024/03/31 19:06:30 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.25 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.26 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -244,7 +244,7 @@ dec_2100_a500_device_register(device_t d
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_3000_300.c
diff -u src/sys/arch/alpha/alpha/dec_3000_300.c:1.48 src/sys/arch/alpha/alpha/dec_3000_300.c:1.49
--- src/sys/arch/alpha/alpha/dec_3000_300.c:1.48 Sat Oct 27 17:17:25 2012
+++ src/sys/arch/alpha/alpha/dec_3000_300.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_300.c,v 1.48 2012/10/27 17:17:25 chs Exp $ */
+/* $NetBSD: dec_3000_300.c,v 1.49 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.48 2012/10/27 17:17:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.49 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -151,7 +151,7 @@ dec_3000_300_device_register(device_t de
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_3000_500.c
diff -u src/sys/arch/alpha/alpha/dec_3000_500.c:1.47 src/sys/arch/alpha/alpha/dec_3000_500.c:1.48
--- src/sys/arch/alpha/alpha/dec_3000_500.c:1.47 Sat Oct 27 17:17:26 2012
+++ src/sys/arch/alpha/alpha/dec_3000_500.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_500.c,v 1.47 2012/10/27 17:17:26 chs Exp $ */
+/* $NetBSD: dec_3000_500.c,v 1.48 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.47 2012/10/27 17:17:26 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.48 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,7 +171,7 @@ dec_3000_500_device_register(device_t de
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_550.c
diff -u src/sys/arch/alpha/alpha/dec_550.c:1.37 src/sys/arch/alpha/alpha/dec_550.c:1.38
--- src/sys/arch/alpha/alpha/dec_550.c:1.37 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_550.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_550.c,v 1.37 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_550.c,v 1.38 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.37 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.38 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -188,7 +188,7 @@ dec_550_device_register(device_t dev, vo
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_6600.c
diff -u src/sys/arch/alpha/alpha/dec_6600.c:1.36 src/sys/arch/alpha/alpha/dec_6600.c:1.37
--- src/sys/arch/alpha/alpha/dec_6600.c:1.36 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_6600.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_6600.c,v 1.36 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_6600.c,v 1.37 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.36 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.37 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -203,7 +203,7 @@ dec_6600_device_register(device_t dev, v
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_alphabook1.c
diff -u src/sys/arch/alpha/alpha/dec_alphabook1.c:1.29 src/sys/arch/alpha/alpha/dec_alphabook1.c:1.30
--- src/sys/arch/alpha/alpha/dec_alphabook1.c:1.29 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_alphabook1.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_alphabook1.c,v 1.29 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_alphabook1.c,v 1.30 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.29 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.30 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ dec_alphabook1_device_register(device_t
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_eb164.c
diff -u src/sys/arch/alpha/alpha/dec_eb164.c:1.63 src/sys/arch/alpha/alpha/dec_eb164.c:1.64
--- src/sys/arch/alpha/alpha/dec_eb164.c:1.63 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_eb164.c Sun Mar 31 19:06:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb164.c,v 1.63 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_eb164.c,v 1.64 2024/03/31 19:06:30 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.63 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.64 2024/03/31 19:06:30 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ dec_eb164_device_register(device_t dev,
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_eb64plus.c
diff -u src/sys/arch/alpha/alpha/dec_eb64plus.c:1.42 src/sys/arch/alpha/alpha/dec_eb64plus.c:1.43
--- src/sys/arch/alpha/alpha/dec_eb64plus.c:1.42 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_eb64plus.c Sun Mar 31 19:06:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb64plus.c,v 1.42 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_eb64plus.c,v 1.43 2024/03/31 19:06:31 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.42 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.43 2024/03/31 19:06:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,7 +191,7 @@ dec_eb64plus_device_register(device_t de
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_eb66.c
diff -u src/sys/arch/alpha/alpha/dec_eb66.c:1.30 src/sys/arch/alpha/alpha/dec_eb66.c:1.31
--- src/sys/arch/alpha/alpha/dec_eb66.c:1.30 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_eb66.c Sun Mar 31 19:06:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb66.c,v 1.30 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_eb66.c,v 1.31 2024/03/31 19:06:31 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.30 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.31 2024/03/31 19:06:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ dec_eb66_device_register(device_t dev, v
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_kn20aa.c
diff -u src/sys/arch/alpha/alpha/dec_kn20aa.c:1.67 src/sys/arch/alpha/alpha/dec_kn20aa.c:1.68
--- src/sys/arch/alpha/alpha/dec_kn20aa.c:1.67 Mon Dec 4 00:32:10 2023
+++ src/sys/arch/alpha/alpha/dec_kn20aa.c Sun Mar 31 19:06:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn20aa.c,v 1.67 2023/12/04 00:32:10 thorpej Exp $ */
+/* $NetBSD: dec_kn20aa.c,v 1.68 2024/03/31 19:06:31 thorpej Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.67 2023/12/04 00:32:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.68 2024/03/31 19:06:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,7 +192,7 @@ dec_kn20aa_device_register(device_t dev,
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_kn300.c
diff -u src/sys/arch/alpha/alpha/dec_kn300.c:1.43 src/sys/arch/alpha/alpha/dec_kn300.c:1.44
--- src/sys/arch/alpha/alpha/dec_kn300.c:1.43 Sat Jun 19 16:36:35 2021
+++ src/sys/arch/alpha/alpha/dec_kn300.c Sun Mar 31 19:06:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn300.c,v 1.43 2021/06/19 16:36:35 thorpej Exp $ */
+/* $NetBSD: dec_kn300.c,v 1.44 2024/03/31 19:06:31 thorpej Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.43 2021/06/19 16:36:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.44 2024/03/31 19:06:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,7 +227,7 @@ dec_kn300_device_register(device_t dev,
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
Index: src/sys/arch/alpha/alpha/dec_kn8ae.c
diff -u src/sys/arch/alpha/alpha/dec_kn8ae.c:1.43 src/sys/arch/alpha/alpha/dec_kn8ae.c:1.44
--- src/sys/arch/alpha/alpha/dec_kn8ae.c:1.43 Fri Sep 4 03:41:49 2020
+++ src/sys/arch/alpha/alpha/dec_kn8ae.c Sun Mar 31 19:06:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn8ae.c,v 1.43 2020/09/04 03:41:49 thorpej Exp $ */
+/* $NetBSD: dec_kn8ae.c,v 1.44 2024/03/31 19:06:31 thorpej Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn8ae.c,v 1.43 2020/09/04 03:41:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn8ae.c,v 1.44 2024/03/31 19:06:31 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,7 @@ dec_kn8ae_device_register(device_t dev,
struct bootdev_data *b = bootdev_data;
device_t parent = device_parent(dev);
- if (found)
+ if (b == NULL || found)
return;
if (!initted) {
