summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale S. Rahn <rahnds@cvs.openbsd.org>2000-04-01 15:30:01 +0000
committerDale S. Rahn <rahnds@cvs.openbsd.org>2000-04-01 15:30:01 +0000
commit22d8b2faeb462b57124331ca0f6daa8387ec902f (patch)
tree2f0229d5aa9be66fc46325711906a6eabfc18562
parentf4d7f6b05b73240ed09460c13577a4e4d9ba1c3d (diff)
timeout -> callout.
-rw-r--r--sys/arch/powerpc/powerpc/machdep.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c
index 5462ef5843b..3831319679c 100644
--- a/sys/arch/powerpc/powerpc/machdep.c
+++ b/sys/arch/powerpc/powerpc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.38 2000/03/31 05:18:46 rahnds Exp $ */
+/* $OpenBSD: machdep.c,v 1.39 2000/04/01 15:30:00 rahnds Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -35,7 +35,6 @@
#include <sys/param.h>
#include <sys/buf.h>
-#include <sys/timeout.h>
#include <sys/exec.h>
#include <sys/malloc.h>
#include <sys/map.h>
@@ -44,6 +43,9 @@
#include <sys/msgbuf.h>
#include <sys/proc.h>
#include <sys/reboot.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/callout.h>
#include <sys/syscallargs.h>
#include <sys/syslog.h>
#include <sys/extent.h>
@@ -515,9 +517,12 @@ cpu_startup()
#endif
/*
- * Initialize timeouts.
+ * Initialize callouts
*/
- timeout_init();
+ callfree = callout;
+ for (i = 1; i < ncallout; i++) {
+ callout[i-1].c_next = &callout[i];
+ }
#ifdef UVM
printf("avail mem = %d\n", ptoa(uvmexp.free));
@@ -562,7 +567,7 @@ allocsys(v)
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
- valloc(timeouts, struct timeout, ntimeout);
+ valloc(callout, struct callout, ncallout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif