From: niklas <niklas@openbsd.org>
Date: Thu, 12 Dec 1996 00:24:41 +0000 (+0000)
Subject: Revert sane attach ordering for the time being
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a73faaa016d2a39a13b33c151a2a6e63bad7c776;p=openbsd

Revert sane attach ordering for the time being
---

diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c
index 41dde9b4f54..98b05691962 100644
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pack.c,v 1.7 1996/12/11 22:36:14 niklas Exp $	*/
+/*	$OpenBSD: pack.c,v 1.8 1996/12/12 00:24:41 niklas Exp $	*/
 /*	$NetBSD: pack.c,v 1.5 1996/08/31 21:15:11 mycroft Exp $	*/
 
 /*
@@ -166,22 +166,19 @@ void
 packdevi()
 {
 	register struct devi *i, *l, *p;
-	register struct deva *d;
+	register struct devbase *d;
 	register int j, m, n;
 
 	packed = emalloc((ndevi + 1) * sizeof *packed);
 	n = 0;
-	for (d = alldevas; d != NULL; d = d->d_next) {
+	for (d = allbases; d != NULL; d = d->d_next) {
 		/*
-		 * For each instance of each attachment, add or collapse
+		 * For each instance of each device, add or collapse
 		 * all its aliases.
 		 */
-		for (i = d->d_ihead; i != NULL; i = i->i_asame) {
+		for (i = d->d_ihead; i != NULL; i = i->i_bsame) {
 			m = n;
 			for (l = i; l != NULL; l = l->i_alias) {
-				/* Skip if we already handled this one.  */
-				if (l->i_cfindex >= 0)
-					continue;
 				l->i_pvlen = 0;
 				l->i_pvoff = -1;
 				l->i_locoff = -1;
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index b4cb0486877..d796b84c152 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.c,v 1.7 1996/12/11 22:36:15 niklas Exp $	*/
+/*	$OpenBSD: sem.c,v 1.8 1996/12/12 00:24:44 niklas Exp $	*/
 /*	$NetBSD: sem.c,v 1.9 1996/08/31 21:15:15 mycroft Exp $	*/
 
 /*
@@ -725,7 +725,6 @@ newdevi(name, unit, d)
 	i->i_atdeva = NULL;
 	i->i_locs = NULL;
 	i->i_cfflags = 0;
-	i->i_cfindex = -1;
 	i->i_lineno = currentline();
 	if (unit >= d->d_umax)
 		d->d_umax = unit + 1;