diff options
author | bde <bde@FreeBSD.org> | 1995-07-29 11:44:31 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1995-07-29 11:44:31 +0000 |
commit | 38a74a7bc23af4d5ed5deeff2f4ab6329b0a26cc (patch) | |
tree | b89d1e0366b685acdcb1eb8c959a65e2e330cb0c /sys/kern | |
parent | 795b455aacbca36da42882b1290f5d37f1618bfe (diff) | |
download | FreeBSD-src-38a74a7bc23af4d5ed5deeff2f4ab6329b0a26cc.zip FreeBSD-src-38a74a7bc23af4d5ed5deeff2f4ab6329b0a26cc.tar.gz |
Eliminate sloppy common-style declarations. There should be none left for
the LINT configuation.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_clock.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_tc.c | 3 | ||||
-rw-r--r-- | sys/kern/kern_timeout.c | 3 | ||||
-rw-r--r-- | sys/kern/subr_param.c | 17 | ||||
-rw-r--r-- | sys/kern/sysv_msg.c | 6 | ||||
-rw-r--r-- | sys/kern/sysv_sem.c | 7 | ||||
-rw-r--r-- | sys/kern/sysv_shm.c | 3 | ||||
-rw-r--r-- | sys/kern/uipc_mbuf.c | 13 | ||||
-rw-r--r-- | sys/kern/vfs_bio.c | 7 | ||||
-rw-r--r-- | sys/kern/vfs_cache.c | 9 |
10 files changed, 46 insertions, 25 deletions
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 7a6d79b..fb686b1 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $ + * $Id: kern_clock.c,v 1.13 1995/05/30 08:05:20 rgrimes Exp $ */ /* Portions of this software are covered by the following: */ @@ -77,7 +77,6 @@ /* Does anybody else really care about these? */ struct callout *callfree, *callout, calltodo; -int ncallout; /* Some of these don't belong here, but it's easiest to concentrate them. */ long cp_time[CPUSTATES]; diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 7a6d79b..fb686b1 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $ + * $Id: kern_clock.c,v 1.13 1995/05/30 08:05:20 rgrimes Exp $ */ /* Portions of this software are covered by the following: */ @@ -77,7 +77,6 @@ /* Does anybody else really care about these? */ struct callout *callfree, *callout, calltodo; -int ncallout; /* Some of these don't belong here, but it's easiest to concentrate them. */ long cp_time[CPUSTATES]; diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 7a6d79b..fb686b1 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 - * $Id: kern_clock.c,v 1.12 1995/03/16 18:12:29 bde Exp $ + * $Id: kern_clock.c,v 1.13 1995/05/30 08:05:20 rgrimes Exp $ */ /* Portions of this software are covered by the following: */ @@ -77,7 +77,6 @@ /* Does anybody else really care about these? */ struct callout *callfree, *callout, calltodo; -int ncallout; /* Some of these don't belong here, but it's easiest to concentrate them. */ long cp_time[CPUSTATES]; diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index 3bba6e6..0a03cd6 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.c 8.2 (Berkeley) 1/21/94 - * $Id: param.c,v 1.10 1995/06/29 07:06:53 davidg Exp $ + * $Id: param.c,v 1.11 1995/06/29 08:21:32 davidg Exp $ */ #include <sys/param.h> @@ -162,19 +162,24 @@ struct msginfo msginfo = { #endif /* - * These are initialized at bootstrap time - * to values dependent on memory size + * These may be set to nonzero here or by patching. + * If they are nonzero at bootstrap time then they are + * initialized to values dependent on the memory size. */ -int nbuf, nswbuf; +#ifdef NBUF +int nbuf = NBUF; +#else +int nbuf = 0; +#endif +int nswbuf = 0; /* * These have to be allocated somewhere; allocating * them here forces loader errors if this file is omitted * (if they've been externed everywhere else; hah!). */ -struct callout *callout; struct cblock *cfree; -struct buf *buf, *swbuf; +struct buf *swbuf; char *buffers; /* diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 4444f6e..09ed9ab 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1,4 +1,4 @@ -/* $Id: sysv_msg.c,v 1.3 1994/10/02 17:35:26 phk Exp $ */ +/* $Id: sysv_msg.c,v 1.4 1995/05/30 08:06:01 rgrimes Exp $ */ /* * Implementation of SVID messages @@ -36,6 +36,10 @@ int (*msgcalls[])() = { msgctl, msgget, msgsnd, msgrcv }; int nfree_msgmaps; /* # of free map entries */ short free_msgmaps; /* head of linked list of free map entries */ struct msg *free_msghdrs; /* list of free msg headers */ +char *msgpool; /* MSGMAX byte long msg buffer pool */ +struct msgmap *msgmaps; /* MSGSEG msgmap structures */ +struct msg *msghdrs; /* MSGTQL msg headers */ +struct msqid_ds *msqids; /* MSGMNI msqid_ds struct's */ void msginit() diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 0be0e34..9141c6f 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1,4 +1,4 @@ -/* $Id: sysv_sem.c,v 1.4 1994/10/06 21:06:32 davidg Exp $ */ +/* $Id: sysv_sem.c,v 1.5 1995/05/30 08:06:02 rgrimes Exp $ */ /* * Implementation of SVID semaphores @@ -18,6 +18,11 @@ static int semctl(), semget(), semop(), semconfig(); int (*semcalls[])() = { semctl, semget, semop, semconfig }; int semtot = 0; +struct semid_ds *sema; /* semaphore id pool */ +struct sem *sem; /* semaphore pool */ +struct map *semmap; /* semaphore allocation map */ +struct sem_undo *semu_list; /* list of active undo structures */ +int *semu; /* undo structure pool */ static struct proc *semlock_holder = NULL; diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index de8379c..8610d90 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.4 1995/02/20 22:23:13 davidg Exp $ */ +/* $Id: sysv_shm.c,v 1.5 1995/05/30 08:06:04 rgrimes Exp $ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* @@ -72,6 +72,7 @@ int (*shmcalls[])() = { shmat, oshmctl, shmdt, shmget, shmctl }; vm_map_t sysvshm_map; int shm_last_free, shm_nused, shm_committed; +struct shmid_ds *shmsegs; struct shm_handle { vm_offset_t kva; diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index d71ff9f..652fe66 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: uipc_mbuf.c,v 1.8 1995/02/23 19:10:21 davidg Exp $ + * $Id: uipc_mbuf.c,v 1.9 1995/03/15 07:51:53 davidg Exp $ */ #include <sys/param.h> @@ -46,11 +46,16 @@ #include <sys/protosw.h> #include <vm/vm.h> +#include <vm/vm_kern.h> -extern vm_map_t mb_map; -struct mbuf *mbutl; +struct mbuf *mbutl; char *mclrefcnt; -int mb_map_full; +struct mbstat mbstat; +union mcluster *mclfree; +int max_linkhdr; +int max_protohdr; +int max_hdr; +int max_datalen; void mbinit() diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 636340a..e9f27d5 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.54 1995/07/25 05:03:06 davidg Exp $ + * $Id: vfs_bio.c,v 1.55 1995/07/25 05:41:57 davidg Exp $ */ /* @@ -52,8 +52,6 @@ #include <miscfs/specfs/specdev.h> struct buf *buf; /* buffer header pool */ -int nbuf; /* number of buffer headers calculated - * elsewhere */ struct swqueue bswlist; void vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to); @@ -92,6 +90,9 @@ int bufspace, maxbufspace; */ int minbuf; +struct bufhashhdr bufhashtbl[BUFHSZ], invalhash; +struct bqueues bufqueues[BUFFER_QUEUES]; + /* * Initialize buffer headers and related structures. */ diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index a05b4a0..7b0fc56 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cache.c 8.3 (Berkeley) 8/22/94 - * $Id: vfs_cache.c,v 1.14 1995/04/15 00:49:35 davidg Exp $ + * $Id: vfs_cache.c,v 1.15 1995/05/30 08:06:28 rgrimes Exp $ */ #include <sys/param.h> @@ -73,9 +73,12 @@ LIST_HEAD(nchashhead, namecache) *nchashtbl; /* Hash Table */ TAILQ_HEAD(, namecache) nclruhead; /* LRU chain */ u_long nchash; /* size of hash table */ -struct nchstats nchstats; /* cache effectiveness statistics */ -struct vnode nchENOENT; /* our own "novnode" */ +struct nchstats nchstats; /* cache effectiveness statistics */ +struct vnode nchENOENT; /* our own "novnode" */ int doingcache = 1; /* 1 => enable the cache */ +u_long nextvnodeid; +u_long numcache; +u_long numvnodes; #ifdef NCH_STATISTICS u_long nchnbr; |