summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/alpha/alpha/machdep.c8
-rw-r--r--sys/arch/hp300/hp300/machdep.c5
-rw-r--r--sys/arch/hppa/hppa/machdep.c6
-rw-r--r--sys/arch/mac68k/mac68k/machdep.c5
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c5
-rw-r--r--sys/arch/mvme88k/mvme88k/machdep.c5
-rw-r--r--sys/arch/sun3/sun3/machdep.c5
-rw-r--r--sys/arch/vax/vax/machdep.c5
-rw-r--r--sys/conf/param.c9
-rw-r--r--sys/kern/init_main.c10
-rw-r--r--sys/kern/tty.c25
-rw-r--r--sys/kern/tty_subr.c5
-rw-r--r--sys/sys/clist.h7
-rw-r--r--sys/sys/tty.h14
14 files changed, 14 insertions, 100 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 07a652b6182..792ecaa4e3a 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.48 2001/06/26 20:25:50 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.49 2001/07/05 10:12:03 art Exp $ */
/* $NetBSD: machdep.c,v 1.206 2000/05/23 05:12:54 thorpej Exp $ */
/*-
@@ -76,9 +76,6 @@
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/file.h>
-#ifdef REAL_CLISTS
-#include <sys/clist.h>
-#endif
#include <sys/timeout.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -829,9 +826,6 @@ allocsys(v)
#define valloc(name, type, num) \
(name) = (type *)v; v = (caddr_t)ALIGN((name)+(num))
-#ifdef REAL_CLISTS
- valloc(cfree, struct cblock, nclist);
-#endif
valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 2a3b084a811..06f2fa01f87 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.52 2001/06/27 04:05:45 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.53 2001/07/05 10:12:06 art Exp $ */
/* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */
/*
@@ -430,9 +430,6 @@ allocsys(v)
#define valloclim(name, type, num, lim) \
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
-#ifdef REAL_CLISTS
- valloc(cfree, struct cblock, nclist);
-#endif
valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index d0e0374fc59..bc754d6b6bb 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.34 2001/05/17 18:41:48 provos Exp $ */
+/* $OpenBSD: machdep.c,v 1.35 2001/07/05 10:12:08 art Exp $ */
/*
* Copyright (c) 1999-2000 Michael Shalayeff
@@ -475,10 +475,6 @@ hptsize=256; /* XXX one page for now */
v = vstart;
#define valloc(name, type, num) (name) = (type *)v; v = (vaddr_t)((name)+(num))
-#ifdef REAL_CLISTS
- valloc(cfree, struct cblock, nclist);
-#endif
-
valloc(timeouts, struct timeout, ntimeout);
valloc(buf, struct buf, nbuf);
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 2f4dda23d7c..a3bf9a048b1 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.73 2001/07/05 07:18:40 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.74 2001/07/05 10:12:10 art Exp $ */
/* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */
/*
@@ -402,9 +402,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)))
-#ifdef REAL_CLISTS
- valloc(cfree, struct cblock, nclist);
-#endif
valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 8b3a881466c..6ec8c805852 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.42 2001/06/27 06:19:48 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.43 2001/07/05 10:12:13 art Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -295,9 +295,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)))
-#ifdef REAL_CLISTS
- valloc(cfree, struct cblock, nclist);
-#endif
valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 08919959227..028f4656e35 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.44 2001/07/01 23:27:52 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.45 2001/07/05 10:12:15 art Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -741,9 +741,6 @@ allocsys(v)
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
-#ifdef REAL_CLISTS
- valloc(cfree, struct cblock, nclist);
-#endif
valloc(timeouts, struct timeout, ntimeout);
#if 0
valloc(swapmap, struct map, nswapmap = maxproc * 2);
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index bff3ba05a4a..0d2fceefccf 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.33 2001/06/27 04:44:03 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.34 2001/07/05 10:12:17 art Exp $ */
/* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */
/*
@@ -188,9 +188,6 @@ allocsys(v)
register caddr_t v;
{
-#ifdef REAL_CLISTS
- valloc(cfree, struct cblock, nclist);
-#endif
valloc(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 794a7d3961f..7a2da3aba70 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.34 2001/06/15 22:45:33 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.35 2001/07/05 10:12:20 art Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -760,9 +760,6 @@ allocsys(v)
register caddr_t v;
{
-#ifdef REAL_CLISTS
- VALLOC(cfree, struct cblock, nclist);
-#endif
VALLOC(timeouts, struct timeout, ntimeout);
#ifdef SYSVSHM
VALLOC(shmsegs, struct shmid_ds, shminfo.shmmni);
diff --git a/sys/conf/param.c b/sys/conf/param.c
index 33b8ad7edf4..7d49d1e06dc 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.c,v 1.13 2001/06/27 04:58:42 art Exp $ */
+/* $OpenBSD: param.c,v 1.14 2001/07/05 10:12:22 art Exp $ */
/* $NetBSD: param.c,v 1.16 1996/03/12 03:08:40 mrg Exp $ */
/*
@@ -48,9 +48,6 @@
#include <sys/vnode.h>
#include <sys/file.h>
#include <sys/timeout.h>
-#ifdef REAL_CLISTS
-#include <sys/clist.h>
-#endif
#include <sys/mbuf.h>
#include <ufs/ufs/quota.h>
#include <sys/kernel.h>
@@ -96,9 +93,6 @@ int maxproc = NPROC;
int desiredvnodes = NVNODE;
int maxfiles = 3 * (NPROC + MAXUSERS) + 80;
int ntimeout = (16 + NPROC) * 2;
-#ifdef REAL_CLISTS
-int nclist = 60 + 12 * MAXUSERS;
-#endif
int nmbclusters = NMBCLUSTERS;
#ifndef MBLOWAT
@@ -178,7 +172,6 @@ int nbuf, nswbuf;
* (if they've been externed everywhere else; hah!).
*/
struct timeout *timeouts;
-struct cblock *cfree;
struct buf *buf, *swbuf;
char *buffers;
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 697165d9149..61f2ade8124 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.71 2001/06/27 07:16:28 art Exp $ */
+/* $OpenBSD: init_main.c,v 1.72 2001/07/05 10:12:24 art Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -60,9 +60,6 @@
#include <sys/tty.h>
#include <sys/conf.h>
#include <sys/buf.h>
-#ifdef REAL_CLISTS
-#include <sys/clist.h>
-#endif
#include <sys/device.h>
#include <sys/protosw.h>
#include <sys/reboot.h>
@@ -321,11 +318,6 @@ main(framep)
/* Start real time and statistics clocks. */
initclocks();
-#ifdef REAL_CLISTS
- /* Initialize clists. */
- clist_init();
-#endif
-
#ifdef SYSVSHM
/* Initialize System V style shared memory. */
shminit();
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index de2eccad18b..15ea3c84d5b 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.44 2001/05/14 07:15:33 angelos Exp $ */
+/* $OpenBSD: tty.c,v 1.45 2001/07/05 10:12:24 art Exp $ */
/* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */
/*-
@@ -80,9 +80,6 @@ void filt_ttywdetach __P((struct knote *kn));
char ttclos[] = "ttycls";
char ttopen[] = "ttyopn";
char ttybg[] = "ttybg";
-#ifdef REAL_CLISTS
-char ttybuf[] = "ttybuf";
-#endif
char ttyin[] = "ttyin";
char ttyout[] = "ttyout";
@@ -1757,17 +1754,8 @@ loop:
if (ce == 0) {
tp->t_rocount = 0;
if (ttyoutput(*cp, tp) >= 0) {
-#ifdef REAL_CLISTS
- /* No Clists, wait a bit. */
- ttstart(tp);
- if (error = ttysleep(tp, &lbolt,
- TTOPRI | PCATCH, ttybuf, 0))
- break;
- goto loop;
-#else
/* out of space */
goto overfull;
-#endif
}
cp++;
cc--;
@@ -1792,17 +1780,8 @@ loop:
cp += ce, cc -= ce, tk_nout += ce;
tp->t_outcc += ce;
if (i > 0) {
-#ifdef REAL_CLISTS
- /* No Clists, wait a bit. */
- ttstart(tp);
- if (error = ttysleep(tp,
- &lbolt, TTOPRI | PCATCH, ttybuf, 0))
- break;
- goto loop;
-#else
/* out of space */
goto overfull;
-#endif
}
if (ISSET(tp->t_lflag, FLUSHO) ||
tp->t_outq.c_cc > hiwat)
@@ -1819,7 +1798,6 @@ out:
uio->uio_resid += cc;
return (error);
-#ifndef REAL_CLISTS
overfull:
/*
* Since we are using ring buffers, if we can't insert any more into
@@ -1828,7 +1806,6 @@ overfull:
* proceed as normal.
*/
hiwat = tp->t_outq.c_cc - 1;
-#endif
ovhiwat:
ttstart(tp);
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 0edd29ff68d..5e2ac28c78c 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_subr.c,v 1.12 2001/06/22 14:14:09 deraadt Exp $ */
+/* $OpenBSD: tty_subr.c,v 1.13 2001/07/05 10:12:25 art Exp $ */
/* $NetBSD: tty_subr.c,v 1.13 1996/02/09 19:00:43 christos Exp $ */
/*
@@ -39,9 +39,6 @@
#include <sys/buf.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
-#ifdef REAL_CLISTS
-#include <sys/clist.h>
-#endif
#include <sys/malloc.h>
/*
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 254c62d56ed..51e355112d6 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clist.h,v 1.2 1996/03/03 12:11:26 niklas Exp $ */
+/* $OpenBSD: clist.h,v 1.3 2001/07/05 10:12:27 art Exp $ */
/* $NetBSD: clist.h,v 1.7 1995/03/26 20:23:57 jtc Exp $ */
/*-
@@ -41,8 +41,3 @@ struct cblock {
char c_quote[CBQSIZE]; /* quoted characters */
char c_info[CBSIZE]; /* characters */
};
-
-#ifdef _KERNEL
-extern struct cblock *cfree, *cfreelist;
-extern int cfreecount, nclist;
-#endif
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 66d6f7f5ba2..e17eebc4e51 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.h,v 1.10 2001/06/22 14:11:00 deraadt Exp $ */
+/* $OpenBSD: tty.h,v 1.11 2001/07/05 10:12:28 art Exp $ */
/* $NetBSD: tty.h,v 1.30.4.1 1996/06/02 09:08:13 mrg Exp $ */
/*-
@@ -60,7 +60,6 @@
{ "tk_cancc", CTLTYPE_QUAD }, \
}
-#ifndef REAL_CLISTS
/*
* Clists are actually ring buffers. The c_cc, c_cf, c_cl fields have
* exactly the same behaviour as in true clists.
@@ -78,17 +77,6 @@ struct clist {
u_char *c_ce; /* c_ce + c_len */
u_char *c_cq; /* N bits/bytes long, see tty_subr.c */
};
-#else
-/*
- * Clists are character lists, which is a variable length linked list
- * of cblocks, with a count of the number of characters in the list.
- */
-struct clist {
- int c_cc; /* Number of characters in the clist. */
- u_char *c_cf; /* Pointer to the first cblock. */
- u_char *c_cl; /* Pointer to the last cblock. */
-};
-#endif
/*
* Per-tty structure.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 11:38:09 +0000