summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/alpha/alpha/machdep.c3
-rw-r--r--sys/arch/amiga/amiga/machdep.c4
-rw-r--r--sys/arch/hp300/hp300/machdep.c3
-rw-r--r--sys/arch/hppa/hppa/machdep.c3
-rw-r--r--sys/arch/i386/i386/machdep.c3
-rw-r--r--sys/arch/mac68k/mac68k/machdep.c3
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c3
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c3
-rw-r--r--sys/arch/mvmeppc/mvmeppc/machdep.c3
-rw-r--r--sys/arch/powerpc/powerpc/machdep.c3
-rw-r--r--sys/arch/sparc/sparc/machdep.c3
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c3
-rw-r--r--sys/arch/sun3/sun3/machdep.c3
-rw-r--r--sys/arch/vax/vax/machdep.c3
-rw-r--r--sys/conf/param.c4
-rw-r--r--sys/sys/timeout.h7
16 files changed, 16 insertions, 38 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 792ecaa4e3a..51c47b1f2cf 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.49 2001/07/05 10:12:03 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.50 2001/08/23 12:02:04 art Exp $ */
/* $NetBSD: machdep.c,v 1.206 2000/05/23 05:12:54 thorpej Exp $ */
/*-
@@ -826,7 +826,6 @@ allocsys(v)
#define valloc(name, type, num) \
(name) = (type *)v; v = (caddr_t)ALIGN((name)+(num))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 4b465aed9e3..dc0dfb7b51c 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.50 2001/08/12 21:36:47 mickey Exp $ */
+/* $OpenBSD: machdep.c,v 1.51 2001/08/23 12:02:04 art Exp $ */
/* $NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $ */
/*
@@ -360,8 +360,6 @@ again:
(name) = (type *)v; v = (caddr_t)((name)+(num))
#define valloclim(name, type, num, lim) \
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
-/* valloc(cfree, struct cblock, nclist); */
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index a13a61b374f..fd185cd84e9 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.57 2001/08/19 17:06:25 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.58 2001/08/23 12:02:04 art Exp $ */
/* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */
/*
@@ -420,7 +420,6 @@ allocsys(v)
#define valloclim(name, type, num, lim) \
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index fe2d161ffcc..a6bffb94796 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.36 2001/07/25 13:25:31 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.37 2001/08/23 12:02:04 art Exp $ */
/*
* Copyright (c) 1999-2000 Michael Shalayeff
@@ -475,7 +475,6 @@ hptsize=256; /* XXX one page for now */
v = vstart;
#define valloc(name, type, num) (name) = (type *)v; v = (vaddr_t)((name)+(num))
- valloc(timeouts, struct timeout, ntimeout);
valloc(buf, struct buf, nbuf);
#ifdef SYSVSHM
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 1def2e9de39..f8ae20f5592 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.172 2001/08/23 11:06:27 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.173 2001/08/23 12:02:04 art Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -476,7 +476,6 @@ allocsys(v)
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index f652b0fc2fa..dcc5cf04cf4 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.76 2001/08/11 23:09:03 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.77 2001/08/23 12:02:04 art Exp $ */
/* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */
/*
@@ -397,7 +397,6 @@ again:
(name) = (type *)v; v = (caddr_t)((name)+(num))
#define valloclim(name, type, num, lim) \
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 62b4f047591..9cee66e9d62 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.48 2001/08/12 23:18:37 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.49 2001/08/23 12:02:04 art Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -294,7 +294,6 @@ again:
(name) = (type *)v; v = (caddr_t)((name)+(num))
#define valloclim(name, type, num, lim) \
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index b9693766961..edea4ffb262 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.51 2001/08/23 08:47:34 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.52 2001/08/23 12:02:04 art Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -740,7 +740,6 @@ allocsys(v)
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index 8fa060525c4..656f031ea56 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.4 2001/07/25 13:25:32 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.5 2001/08/23 12:02:04 art Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -605,7 +605,6 @@ allocsys(v)
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c
index ea1e351469e..7ff29667813 100644
--- a/sys/arch/powerpc/powerpc/machdep.c
+++ b/sys/arch/powerpc/powerpc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.78 2001/08/23 00:09:15 drahn Exp $ */
+/* $OpenBSD: machdep.c,v 1.79 2001/08/23 12:02:04 art Exp $ */
/* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */
/*
@@ -608,7 +608,6 @@ allocsys(v)
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index e0be4ea1265..3c255a39705 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.60 2001/07/25 13:25:33 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.61 2001/08/23 12:02:05 art Exp $ */
/* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
/*
@@ -315,7 +315,6 @@ allocsys(v)
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index ed6a6f4ddd5..f9849b51e21 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.8 2001/08/20 20:23:53 jason Exp $ */
+/* $OpenBSD: machdep.c,v 1.9 2001/08/23 12:02:05 art Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -351,7 +351,6 @@ allocsys(caddr_t v)
{
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index d070f36b9e3..cf4c04542ee 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.36 2001/08/11 23:21:14 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.37 2001/08/23 12:02:05 art Exp $ */
/* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */
/*
@@ -186,7 +186,6 @@ allocsys(v)
register caddr_t v;
{
- valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 8cab319a0a7..a6493ef6bdd 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.36 2001/07/25 13:25:33 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.37 2001/08/23 12:02:05 art Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -760,7 +760,6 @@ allocsys(v)
register caddr_t v;
{
- VALLOC(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
VALLOC(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif
diff --git a/sys/conf/param.c b/sys/conf/param.c
index 22a8feeed3f..d45619fd5b9 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.c,v 1.15 2001/08/12 23:58:34 millert Exp $ */
+/* $OpenBSD: param.c,v 1.16 2001/08/23 12:02:04 art Exp $ */
/* $NetBSD: param.c,v 1.16 1996/03/12 03:08:40 mrg Exp $ */
/*
@@ -92,7 +92,6 @@ int maxproc = NPROC;
#define NVNODE (NPROC * 2 + NTEXT + 100)
int desiredvnodes = NVNODE;
int maxfiles = 3 * (NPROC + MAXUSERS) + 80;
-int ntimeout = (16 + NPROC) * 2;
int nmbclusters = NMBCLUSTERS;
#ifndef MBLOWAT
@@ -170,7 +169,6 @@ int nbuf, nswbuf;
* them here forces loader errors if this file is omitted
* (if they've been externed everywhere else; hah!).
*/
-struct timeout *timeouts;
struct buf *buf, *swbuf;
char *buffers;
diff --git a/sys/sys/timeout.h b/sys/sys/timeout.h
index 1f0f2d214f3..8131606a315 100644
--- a/sys/sys/timeout.h
+++ b/sys/sys/timeout.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timeout.h,v 1.8 2001/08/23 08:18:59 miod Exp $ */
+/* $OpenBSD: timeout.h,v 1.9 2001/08/23 12:02:04 art Exp $ */
/*
* Copyright (c) 2000 Artur Grabowski <art@openbsd.org>
* All rights reserved.
@@ -97,9 +97,4 @@ void timeout_init __P((void));
*/
int timeout_hardclock_update __P((void));
-/*
- * XXX - this should go away.
- */
-extern int ntimeout;
-extern struct timeout *timeouts;
#endif /* _SYS_TIMEOUT_H_ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 22:51:56 +0000