Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sparc/sparc if a device is marked as BS_EARLY but n...
details: https://anonhg.NetBSD.org/src/rev/e71e4efb3823
branches: trunk
changeset: 328901:e71e4efb3823
user: macallan <macallan%NetBSD.org@localhost>
date: Wed Apr 23 09:06:57 2014 +0000
description:
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
diffstat:
sys/arch/sparc/sparc/autoconf.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diffs (30 lines):
diff -r c1a5be5f35f1 -r e71e4efb3823 sys/arch/sparc/sparc/autoconf.c
--- a/sys/arch/sparc/sparc/autoconf.c Wed Apr 23 07:34:30 2014 +0000
+++ b/sys/arch/sparc/sparc/autoconf.c Wed Apr 23 09:06:57 2014 +0000
@@ -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 @@
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);
+ }
}
/*
Home |
Main Index |
Thread Index |
Old Index