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/mvme88k | |
| 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/mvme88k')
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/autoconf.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c index 62c606e7aa6..670b46d89c1 100644 --- a/sys/arch/mvme88k/mvme88k/autoconf.c +++ b/sys/arch/mvme88k/mvme88k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.37 2007/05/04 19:30:55 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.38 2007/06/01 19:25:10 deraadt Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -85,23 +85,26 @@ cpu_configure() set_psr(get_psr() & ~PSR_IND); spl0(); - printf("boot device: %s\n", - (bootdv) ? bootdv->dv_xname : "<unknown>"); - - setroot(bootdv, bootpart, RB_USERREQ); - dumpconf(); - /* * Finally switch to the real console driver, * and say goodbye to the BUG! */ cn_tab = NULL; cninit(); - cold = 0; } void +diskconf(void) +{ + printf("boot device: %s\n", + (bootdv) ? bootdv->dv_xname : "<unknown>"); + + setroot(bootdv, bootpart, RB_USERREQ); + dumpconf(); +} + +void device_register(struct device *dev, void *aux) { if (bootpart == -1) /* ignore flag from controller driver? */ |