diff options
| author | Dale S. Rahn <rahnds@cvs.openbsd.org> | 2000-04-02 00:14:32 +0000 |
|---|---|---|
| committer | Dale S. Rahn <rahnds@cvs.openbsd.org> | 2000-04-02 00:14:32 +0000 |
| commit | 02365800cc1cf82a6ea3e4c357c38bc26e86f3c5 (patch) | |
| tree | 2f11dcc68d4b3c918b4d669efa1436bda1121b62 /sys/arch | |
| parent | 100ef0607ae2f50303e2571460835a91257a28fe (diff) | |
callout->timeout.
Ok, my tree was not fully updated, and it was committed
incorrectly. This is version 1.38 checked in again.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/powerpc/powerpc/machdep.c | 15 |
1 files 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 |