diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-01 19:25:11 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-01 19:25:11 +0000 |
| commit | 9c5a2e4c4f28b5ccad97ba01105a6a578f413e57 (patch) | |
| tree | 83a977fda25aa6268bb006b9257444599adee9b5 /sys/arch/mvmeppc | |
| parent | fb46e3f564238bbc25c79e1509ce9b3484d74b33 (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/mvmeppc')
| -rw-r--r-- | sys/arch/mvmeppc/mvmeppc/autoconf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/arch/mvmeppc/mvmeppc/autoconf.c b/sys/arch/mvmeppc/mvmeppc/autoconf.c index fafb7a88d12..69d6efa1ee5 100644 --- a/sys/arch/mvmeppc/mvmeppc/autoconf.c +++ b/sys/arch/mvmeppc/mvmeppc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.17 2007/05/29 20:36:48 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.18 2007/06/01 19:25:10 deraadt Exp $ */ /* * Copyright (c) 1996, 1997 Per Fogelstrom * Copyright (c) 1995 Theo de Raadt @@ -37,7 +37,7 @@ * from: Utah Hdr: autoconf.c 1.31 91/01/21 * * from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93 - * $Id: autoconf.c,v 1.17 2007/05/29 20:36:48 deraadt Exp $ + * $Id: autoconf.c,v 1.18 2007/06/01 19:25:10 deraadt Exp $ */ /* @@ -61,7 +61,6 @@ extern void dumpconf(void); struct device *getdevunit(char *, int); -void diskconf(void); void calc_delayconst(void); /* clock.c */ /* @@ -94,13 +93,11 @@ cpu_configure() * as the console for now, and it requires the clock to be ticking * for proper operation (think boot -a ...) */ - md_diskconf = diskconf; - cold = 0; } void -diskconf() +diskconf(void) { printf("boot device: %s\n", (bootdv != NULL) ? bootdv->dv_xname : "<unknown>"); |