summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2004-01-21 19:03:45 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2004-01-21 19:03:45 +0000
commit015a4179321bbc59cf34543034f1e859d4815555 (patch)
tree6a6d1ce00242dbbaa22694334c727fa9ebf9032c
parent17a567c9f32392e770f995c5081497b55130bb3b (diff)
call timeout_startup early, so timeouts are available. report from sam smith
ok art deraadt
-rw-r--r--sys/kern/init_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index efc735280b8..a8812c2b15c 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.110 2004/01/14 19:34:05 grange Exp $ */
+/* $OpenBSD: init_main.c,v 1.111 2004/01/21 19:03:44 tedu Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -195,6 +195,11 @@ main(framep)
curproc = p = &proc0;
/*
+ * Initialize timeouts.
+ */
+ timeout_startup();
+
+ /*
* Attempt to find console and initialize
* in case of early panic or other messages.
*/
@@ -217,11 +222,6 @@ main(framep)
/* Initalize sockets. */
soinit();
- /*
- * Initialize timeouts.
- */
- timeout_startup();
-
/* Initialize sysctls (must be done before any processes run) */
sysctl_init();