Module Name: src
Committed By: macallan
Date: Wed Apr 23 09:06:57 UTC 2014
Modified Files:
src/sys/arch/sparc/sparc: autoconf.c
Log Message:
if a device is marked as BS_EARLY but no driver is present don't panic()
when the device is also BS_OPTIONAL
now kernels without the sx driver will boot again on hardware that has SX
To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/arch/sparc/sparc/autoconf.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/sparc/sparc/autoconf.c
diff -u src/sys/arch/sparc/sparc/autoconf.c:1.255 src/sys/arch/sparc/sparc/autoconf.c:1.256
--- src/sys/arch/sparc/sparc/autoconf.c:1.255 Wed Mar 26 17:31:13 2014
+++ src/sys/arch/sparc/sparc/autoconf.c Wed Apr 23 09:06:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.255 2014/03/26 17:31:13 christos Exp $ */
+/* $NetBSD: autoconf.c,v 1.256 2014/04/23 09:06:57 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.255 2014/03/26 17:31:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.256 2014/04/23 09:06:57 macallan Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -1311,8 +1311,10 @@ extern struct sparc_bus_space_tag mainbu
if (prom_getprop_address1(node, &ma.ma_promvaddr) != 0)
continue;
- if (config_found(dev, (void *)&ma, mbprint) == NULL)
+ if (config_found(dev, (void *)&ma, mbprint) == NULL) {
+ if (ssp->flags & BS_OPTIONAL) continue;
panic(sp);
+ }
}
/*
