diff options
| author |   niklas <niklas@openbsd.org> | 1996-05-07 15:23:35 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1996-05-07 15:23:35 +0000 |
| commit | fbaa1a79766505d09f635cf6054b14b29da91067 (patch) | |
| tree | 05197d3d0323e416409be137f46c2ede57a5b04a /sys/kern/init_main.c | |
| parent | from NetBSD PR#2296: (diff) | |
| download | wireguard-openbsd-fbaa1a79766505d09f635cf6054b14b29da91067.tar.xz wireguard-openbsd-fbaa1a79766505d09f635cf6054b14b29da91067.zip | |
Make sure config_init gets called before consinit, as at least one port
actually uses config_* functions for console attachment. Document
config_init should not call malloc as the move was over the mem-init
function calls too.
Diffstat (limited to 'sys/kern/init_main.c')
| -rw-r--r-- | sys/kern/init_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index bd2c5250ad1..a76698e3ffb 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.7 1996/05/06 09:56:20 niklas Exp $ */ +/* $OpenBSD: init_main.c,v 1.8 1996/05/07 15:23:35 niklas Exp $ */ /* $NetBSD: init_main.c,v 1.84 1996/04/22 01:38:12 christos Exp $ */ /* @@ -171,17 +171,18 @@ main(framep) */ p = &proc0; curproc = p; + /* * Attempt to find console and initialize * in case of early panic or other messages. */ + config_init(); /* init autoconfiguration data structures */ consinit(); printf(copyright); vm_mem_init(); kmeminit(); disk_init(); /* must come before autoconfiguration */ - config_init(); /* init autoconfiguration data structures */ cpu_startup(); /* |