summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-10-07 10:58:43 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-10-07 10:58:43 +0000
commitc46d7526b86e9917ca4c8fe1d43a59b5b29a525c (patch)
tree9e9230a4ae264cc236c0fc5393fddbb85af31563 /sys
parentb2b9338988165b9df206da59cb9058b147f07211 (diff)
Move dumpconf, and make swapconf more standard
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amiga/amiga/autoconf.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/amiga/amiga/autoconf.c b/sys/arch/amiga/amiga/autoconf.c
index 1b69dea8d84..5438194c2ea 100644
--- a/sys/arch/amiga/amiga/autoconf.c
+++ b/sys/arch/amiga/amiga/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.10 1997/09/18 13:39:32 niklas Exp $ */
+/* $OpenBSD: autoconf.c,v 1.11 1997/10/07 10:58:42 niklas Exp $ */
/* $NetBSD: autoconf.c,v 1.56 1997/08/31 16:33:13 is Exp $ */
/*
@@ -116,6 +116,12 @@ configure()
#ifdef DEBUG_KERNEL_START
printf("survived swap device search\n");
#endif
+ dumpconf();
+ if (dumplo < 0)
+ dumplo = 0;
+#ifdef DEBUG_KERNEL_START
+ printf("survived dump device search\n");
+#endif
cold = 0;
}
@@ -305,7 +311,7 @@ swapconf()
u_int maj;
int nb;
- for (swp = swdevt; swp->sw_dev > 0; swp++) {
+ for (swp = swdevt; swp->sw_dev != NODEV; swp++) {
maj = major(swp->sw_dev);
if (maj > nblkdev)
@@ -321,10 +327,6 @@ swapconf()
}
swp->sw_nblks = ctod(dtoc(swp->sw_nblks));
}
- dumpconf();
- if (dumplo < 0)
- dumplo = 0;
-
}
#define DOSWAP /* change swdevt and dumpdev */