summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-01 19:25:11 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-01 19:25:11 +0000
commit9c5a2e4c4f28b5ccad97ba01105a6a578f413e57 (patch)
tree83a977fda25aa6268bb006b9257444599adee9b5 /sys/arch/i386
parentfb46e3f564238bbc25c79e1509ce9b3484d74b33 (diff)
some architectures called setroot() from cpu_configure(), *way* before some
subsystems were enabled. others used a *md_diskconf -> diskconf() method to make sure init_main could "do late setroot". Change all architectures to have diskconf(), use it directly & late. tested by todd and myself on most architectures, ok miod too
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/autoconf.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 966dbd1e75b..0177206a6e1 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.74 2007/05/15 01:56:47 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.75 2007/06/01 19:25:10 deraadt Exp $ */
/* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */
/*-
@@ -76,8 +76,6 @@
#include <machine/i82093var.h>
#endif
-void diskconf(void);
-
/*
* The following several variables are related to
* the configuration process, and are used in initializing
@@ -146,7 +144,6 @@ cpu_configure(void)
* We can not know which is our root disk, defer
* until we can checksum blocks to figure it out.
*/
- md_diskconf = diskconf;
cold = 0;
#ifdef I686_CPU