From 84d6abd0f8eb0fd3d9ca973aaf2357339c483f80 Mon Sep 17 00:00:00 2001
From: rahnds <rahnds@openbsd.org>
Date: Sun, 2 Apr 2000 00:14:31 +0000
Subject: [PATCH] callout->timeout. Ok, my tree was not fully updated, and it
 was committed incorrectly. This is version 1.38 checked in again.

---
 sys/arch/powerpc/powerpc/machdep.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c
index 3831319679c..c7149619569 100644
--- a/sys/arch/powerpc/powerpc/machdep.c
+++ b/sys/arch/powerpc/powerpc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.39 2000/04/01 15:30:00 rahnds Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.40 2000/04/02 00:14:31 rahnds Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -35,6 +35,7 @@
 
 #include <sys/param.h>
 #include <sys/buf.h>
+#include <sys/timeout.h>
 #include <sys/exec.h>
 #include <sys/malloc.h>
 #include <sys/map.h>
@@ -43,9 +44,6 @@
 #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>
@@ -517,12 +515,9 @@ cpu_startup()
 #endif
 	
 	/*
-	 * Initialize callouts
+	 * Initialize timeouts.
 	 */
-	callfree = callout;
-	for (i = 1; i < ncallout; i++) {
-		callout[i-1].c_next = &callout[i];
-	}
+	timeout_init();
 	
 #ifdef UVM
 	printf("avail mem = %d\n", ptoa(uvmexp.free));
@@ -567,7 +562,7 @@ allocsys(v)
 #define	valloc(name, type, num) \
 	v = (caddr_t)(((name) = (type *)v) + (num))
 
-        valloc(callout, struct callout, ncallout);
+	valloc(timeouts, struct timeout, ntimeout);
 #ifdef	SYSVSHM
 	valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
 #endif
-- 
2.20.1