diff options
| author |   deraadt <deraadt@openbsd.org> | 2007-06-01 19:25:08 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2007-06-01 19:25:08 +0000 |
| commit | 4ccde59994f15f847e67b704652f85732ea8c4be (patch) | |
| tree | 7fb8eab25d309598734cdacdb435b58cc02aaef1 /sys/kern/init_main.c | |
| parent | Add two constraints to V1 disklabels: (diff) | |
| download | wireguard-openbsd-4ccde59994f15f847e67b704652f85732ea8c4be.tar.xz wireguard-openbsd-4ccde59994f15f847e67b704652f85732ea8c4be.zip | |
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/kern/init_main.c')
| -rw-r--r-- | sys/kern/init_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 91069c58232..e6f95b17957 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.141 2007/05/31 18:16:59 dlg Exp $ */ +/* $OpenBSD: init_main.c,v 1.142 2007/06/01 19:25:09 deraadt Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -119,7 +119,6 @@ struct proc *initproc; int cmask = CMASK; extern struct user *proc0paddr; -void (*md_diskconf)(void) = NULL; struct vnode *rootvp, *swapdev_vp; int boothowto; struct timeval boottime; @@ -446,8 +445,7 @@ main(void *framep) #endif /* Configure root/swap devices */ - if (md_diskconf) - (*md_diskconf)(); + diskconf(); /* Mount the root file system. */ if (vfs_mountroot()) |