Some staticized variables were still declared to be extern.

32 files changed, 41 insertions, 81 deletions

diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index 25cc3d3..bbba54d 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id$
+ * $Id: fdesc.h,v 1.5 1997/02/22 09:40:14 peter Exp $
  */
 
 #ifdef KERNEL
@@ -76,6 +76,4 @@ extern dev_t devctty;
 extern int fdesc_init __P((struct vfsconf *));
 extern int fdesc_root __P((struct mount *, struct vnode **));
 extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **));
-extern vop_t **fdesc_vnodeop_p;
-extern struct vfsops fdesc_vfsops;
 #endif /* KERNEL */
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 8753b34..cb64906 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.23 1997/02/22 09:40:15 peter Exp $
+ * $Id: fdesc_vnops.c,v 1.24 1997/09/02 20:06:09 bde Exp $
  */
 
 /*
@@ -67,6 +67,8 @@ extern	struct cdevsw ctty_cdevsw;
 #define FDL_LOCKED	0x02
 static int fdcache_lock;
 
+static vop_t **fdesc_vnodeop_p;
+
 dev_t devctty;
 
 #if (FD_STDIN != FD_STDOUT-1) || (FD_STDOUT != FD_STDERR-1)
@@ -940,7 +942,6 @@ fdesc_badop()
 #define fdesc_update ((int (*) __P((struct  vop_update_args *)))eopnotsupp)
 #define fdesc_bwrite ((int (*) __P((struct  vop_bwrite_args *)))eopnotsupp)
 
-static vop_t **fdesc_vnodeop_p;
 static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fdesc_lookup },		/* lookup */
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index 0b438fe..7d46a11 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $Id: null.h,v 1.6 1997/02/22 09:40:20 peter Exp $
+ * $Id: null.h,v 1.7 1997/05/25 04:50:02 peter Exp $
  */
 
 struct null_args {
@@ -73,5 +73,4 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
 extern int	null_bypass __P((struct vop_generic_args *ap));
 
 extern vop_t **null_vnodeop_p;
-extern struct vfsops null_vfsops;
 #endif /* KERNEL */
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index 3d85d8e..d60826e 100644
--- a/sys/fs/portalfs/portal.h
+++ b/sys/fs/portalfs/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id$
+ * $Id: portal.h,v 1.4 1997/02/22 09:40:24 peter Exp $
  */
 
 struct portal_args {
@@ -68,5 +68,4 @@ struct portalnode {
 #define PORTAL_ROOTFILEID	2
 
 extern vop_t **portal_vnodeop_p;
-extern struct vfsops portal_vfsops;
 #endif /* KERNEL */
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 9e051d4..76f1e8e 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.15 1997/02/22 09:40:26 peter Exp $
+ *	$Id: procfs.h,v 1.16 1997/08/12 04:34:27 sef Exp $
  */
 
 /*
@@ -164,7 +164,6 @@ int procfs_validtype __P((struct proc *));
 #define PROCFS_WANT	0x02
 
 extern vop_t **procfs_vnodeop_p;
-extern struct vfsops procfs_vfsops;
 
 int	procfs_root __P((struct mount *, struct vnode **));
 int	procfs_rw __P((struct vop_read_args *));
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 54b7502..0c6ca34 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.4 (Berkeley) 8/20/94
  *
- * $Id$
+ * $Id: umap.h,v 1.8 1997/02/22 09:40:37 peter Exp $
  */
 
 #define MAPFILEENTRIES 64
@@ -88,5 +88,4 @@ extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
 #endif
 
 extern vop_t **umap_vnodeop_p;
-extern struct vfsops umap_vfsops;
 #endif /* KERNEL */
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 03de315..af5ffda 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.38 1997/08/21 20:33:38 bde Exp $
+ * $Id: kern_clock.c,v 1.39 1997/09/02 20:05:37 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -93,7 +93,7 @@ static struct callout calltodo;
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 static long cp_time[CPUSTATES];
 long dk_seek[DK_NDRIVE];
-static long dk_time[DK_NDRIVE];
+static long dk_time[DK_NDRIVE];	/* time busy (in statclock ticks) */
 long dk_wds[DK_NDRIVE];
 long dk_wpms[DK_NDRIVE];
 long dk_xfer[DK_NDRIVE];
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 03de315..af5ffda 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.38 1997/08/21 20:33:38 bde Exp $
+ * $Id: kern_clock.c,v 1.39 1997/09/02 20:05:37 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -93,7 +93,7 @@ static struct callout calltodo;
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 static long cp_time[CPUSTATES];
 long dk_seek[DK_NDRIVE];
-static long dk_time[DK_NDRIVE];
+static long dk_time[DK_NDRIVE];	/* time busy (in statclock ticks) */
 long dk_wds[DK_NDRIVE];
 long dk_wpms[DK_NDRIVE];
 long dk_xfer[DK_NDRIVE];
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 03de315..af5ffda 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.38 1997/08/21 20:33:38 bde Exp $
+ * $Id: kern_clock.c,v 1.39 1997/09/02 20:05:37 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -93,7 +93,7 @@ static struct callout calltodo;
 /* Some of these don't belong here, but it's easiest to concentrate them. */
 static long cp_time[CPUSTATES];
 long dk_seek[DK_NDRIVE];
-static long dk_time[DK_NDRIVE];
+static long dk_time[DK_NDRIVE];	/* time busy (in statclock ticks) */
 long dk_wds[DK_NDRIVE];
 long dk_wpms[DK_NDRIVE];
 long dk_xfer[DK_NDRIVE];
diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h
index 25cc3d3..bbba54d 100644
--- a/sys/miscfs/fdesc/fdesc.h
+++ b/sys/miscfs/fdesc/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id$
+ * $Id: fdesc.h,v 1.5 1997/02/22 09:40:14 peter Exp $
  */
 
 #ifdef KERNEL
@@ -76,6 +76,4 @@ extern dev_t devctty;
 extern int fdesc_init __P((struct vfsconf *));
 extern int fdesc_root __P((struct mount *, struct vnode **));
 extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **));
-extern vop_t **fdesc_vnodeop_p;
-extern struct vfsops fdesc_vfsops;
 #endif /* KERNEL */
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 8753b34..cb64906 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.23 1997/02/22 09:40:15 peter Exp $
+ * $Id: fdesc_vnops.c,v 1.24 1997/09/02 20:06:09 bde Exp $
  */
 
 /*
@@ -67,6 +67,8 @@ extern	struct cdevsw ctty_cdevsw;
 #define FDL_LOCKED	0x02
 static int fdcache_lock;
 
+static vop_t **fdesc_vnodeop_p;
+
 dev_t devctty;
 
 #if (FD_STDIN != FD_STDOUT-1) || (FD_STDOUT != FD_STDERR-1)
@@ -940,7 +942,6 @@ fdesc_badop()
 #define fdesc_update ((int (*) __P((struct  vop_update_args *)))eopnotsupp)
 #define fdesc_bwrite ((int (*) __P((struct  vop_bwrite_args *)))eopnotsupp)
 
-static vop_t **fdesc_vnodeop_p;
 static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fdesc_lookup },		/* lookup */
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index aa98050..1488bc6 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs.h	8.6 (Berkeley) 3/29/95
- * $Id: kernfs.h,v 1.6 1997/02/22 09:40:18 peter Exp $
+ * $Id: kernfs.h,v 1.7 1997/08/16 19:15:14 wollman Exp $
  */
 
 #define	_PATH_KERNFS	"/kern"		/* Default mountpoint */
@@ -63,6 +63,5 @@ struct kernfs_node {
 	    eopnotsupp)
 #define kernfs_vptofh ((int (*) __P((struct vnode *, struct fid *)))eopnotsupp)
 extern vop_t **kernfs_vnodeop_p;
-extern struct vfsops kernfs_vfsops;
 extern dev_t rrootdev;
 #endif /* KERNEL */
diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index 0b438fe..7d46a11 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $Id: null.h,v 1.6 1997/02/22 09:40:20 peter Exp $
+ * $Id: null.h,v 1.7 1997/05/25 04:50:02 peter Exp $
  */
 
 struct null_args {
@@ -73,5 +73,4 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
 extern int	null_bypass __P((struct vop_generic_args *ap));
 
 extern vop_t **null_vnodeop_p;
-extern struct vfsops null_vfsops;
 #endif /* KERNEL */
diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h
index 3d85d8e..d60826e 100644
--- a/sys/miscfs/portal/portal.h
+++ b/sys/miscfs/portal/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id$
+ * $Id: portal.h,v 1.4 1997/02/22 09:40:24 peter Exp $
  */
 
 struct portal_args {
@@ -68,5 +68,4 @@ struct portalnode {
 #define PORTAL_ROOTFILEID	2
 
 extern vop_t **portal_vnodeop_p;
-extern struct vfsops portal_vfsops;
 #endif /* KERNEL */
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index 9e051d4..76f1e8e 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.15 1997/02/22 09:40:26 peter Exp $
+ *	$Id: procfs.h,v 1.16 1997/08/12 04:34:27 sef Exp $
  */
 
 /*
@@ -164,7 +164,6 @@ int procfs_validtype __P((struct proc *));
 #define PROCFS_WANT	0x02
 
 extern vop_t **procfs_vnodeop_p;
-extern struct vfsops procfs_vfsops;
 
 int	procfs_root __P((struct mount *, struct vnode **));
 int	procfs_rw __P((struct vop_read_args *));
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 54b7502..0c6ca34 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.4 (Berkeley) 8/20/94
  *
- * $Id$
+ * $Id: umap.h,v 1.8 1997/02/22 09:40:37 peter Exp $
  */
 
 #define MAPFILEENTRIES 64
@@ -88,5 +88,4 @@ extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
 #endif
 
 extern vop_t **umap_vnodeop_p;
-extern struct vfsops umap_vfsops;
 #endif /* KERNEL */
diff --git a/sys/net/route.h b/sys/net/route.h
index 361c3b5..4adb54c 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id$
+ * $Id: route.h,v 1.26 1997/02/22 09:41:15 peter Exp $
  */
 
 #ifndef _NET_ROUTE_H_
@@ -261,7 +261,6 @@ struct route_cb {
 		(rt)->rt_refcnt--;
 
 extern struct route_cb route_cb;
-extern struct rtstat rtstat;
 extern struct radix_node_head *rt_tables[AF_MAX+1];
 
 /* forward declaration for rt_newmaddrmsg() */
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index cb8af60..13b778e 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: icmp_var.h,v 1.7 1997/08/25 01:25:29 wollman Exp $
+ * $Id: icmp_var.h,v 1.8 1997/08/25 16:29:25 wollman Exp $
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
@@ -71,8 +71,4 @@ struct	icmpstat {
 	{ "stats", CTLTYPE_STRUCT }, \
 }
 
-#ifdef KERNEL
-extern struct	icmpstat icmpstat;
-#endif
-
 #endif
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index f408bf2..6be729d 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $Id$
+ * $Id: igmp_var.h,v 1.11 1997/02/22 09:41:27 peter Exp $
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
@@ -63,8 +63,6 @@ struct igmpstat {
 };
 
 #ifdef KERNEL
-extern struct igmpstat igmpstat;
-
 #define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
 
 /*
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index f61a26d..83f5baa 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: in_var.h,v 1.25 1997/02/22 09:41:30 peter Exp $
+ *	$Id: in_var.h,v 1.26 1997/04/27 20:01:06 wollman Exp $
  */
 
 #ifndef _NETINET_IN_VAR_H_
@@ -85,9 +85,6 @@ extern	TAILQ_HEAD(in_ifaddrhead, in_ifaddr) in_ifaddrhead;
 extern	struct	ifqueue	ipintrq;		/* ip packet input queue */
 extern	struct	in_addr zeroin_addr;
 extern	u_char	inetctlerrmap[];
-extern	int rtq_reallyold;	/* XXX */
-extern	int rtq_minreallyold;	/* XXX */
-extern	int rtq_toomany;	/* XXX */
 
 /*
  * Macro for finding the interface (ifnet structure) corresponding to one
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index c262a5d..f80a353 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: ip_var.h,v 1.32 1997/04/27 20:01:08 wollman Exp $
+ *	$Id: ip_var.h,v 1.33 1997/05/25 06:09:23 peter Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
@@ -161,7 +161,6 @@ struct inpcb;
 struct route;
 
 extern struct	ipstat	ipstat;
-extern struct	ipq	ipq;			/* ip reass. queue */
 extern u_short	ip_id;				/* ip packet ctr, for ids */
 extern int	ip_defttl;			/* default IP ttl */
 extern u_char	ip_protox[];
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index 38ffac4..a2fcb77 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- *	$Id$
+ *	$Id: tcp_timer.h,v 1.12 1997/02/22 09:41:42 peter Exp $
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
@@ -129,7 +129,6 @@ static char *tcptimers[] =
 #ifdef KERNEL
 extern int tcp_keepinit;		/* time to establish connection */
 extern int tcp_keepidle;		/* time before keepalive probes begin */
-extern int tcp_keepintvl;		/* time between keepalive probes */
 extern int tcp_maxidle;			/* time to drop after starting probes */
 extern int tcp_ttl;			/* time to live for TCP segs */
 extern int tcp_backoff[];
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 4227219..fb21bfd 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: udp_var.h,v 1.12 1997/02/22 09:41:44 peter Exp $
+ * $Id: udp_var.h,v 1.13 1997/08/16 19:15:42 wollman Exp $
  */
 
 #ifndef _NETINET_UDP_VAR_H_
@@ -100,9 +100,6 @@ struct	udpstat {
 }
 
 #ifdef KERNEL
-extern struct	inpcbhead udb;
-extern struct	inpcbinfo udbinfo;
-extern struct	udpstat udpstat;
 extern struct	pr_usrreqs udp_usrreqs;
 
 void	 udp_ctlinput __P((int, struct sockaddr *, void *));
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index 5fec98f..454a2a0 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: callout.h,v 1.6 1997/02/22 09:44:50 peter Exp $
  */
 
 #ifndef _SYS_CALLOUT_H_
@@ -50,7 +50,7 @@ struct callout {
 };
 
 #ifdef KERNEL
-extern struct	callout *callfree, *callout, calltodo;
+extern struct	callout *callfree, *callout;
 extern int	ncallout;
 #endif
 
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index f1456db..5e87f2b 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $Id$
+ * $Id: clist.h,v 1.7 1997/02/22 09:44:58 peter Exp $
  */
 
 #ifndef _SYS_CLIST_H_
@@ -44,7 +44,7 @@ struct cblock {
 };
 
 #ifdef KERNEL
-extern	struct cblock *cfree, *cfreelist;
+extern	struct cblock *cfree;
 extern	int cfreecount;
 #endif
 
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index 497a091..edec8ce 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: dkstat.h,v 1.8 1997/02/22 09:45:08 peter Exp $
  */
 
 #ifndef _SYS_DKSTAT_H_
@@ -52,9 +52,7 @@
 #define	DK_NDRIVE	8
 #define DK_NAMELEN	8
 #ifdef KERNEL
-extern long cp_time[CPUSTATES];
 extern long dk_seek[DK_NDRIVE];	/* # seeks */
-extern long dk_time[DK_NDRIVE];	/* time busy (in statclock ticks) */
 extern long dk_wds[DK_NDRIVE];	/* # blocks of 32*16-bit words transferred */
 extern long dk_wpms[DK_NDRIVE];	/* transfer rate in 16-bit words per second */
 extern long dk_xfer[DK_NDRIVE];	/* # transfers */
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 97543c2..d980951 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: exec.h,v 1.15 1997/02/22 09:45:11 peter Exp $
  */
 
 #ifndef _SYS_EXEC_H_
@@ -71,11 +71,6 @@ struct execsw {
 	const char *ex_name;
 };
 
-#ifdef KERNEL
-extern const struct execsw **execsw;
-
-#endif
-
 #include <machine/exec.h>
 
 #endif
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 0224bbc..b9e69f9 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_elf.h,v 1.4 1997/02/22 09:45:19 peter Exp $
+ *	$Id: imgact_elf.h,v 1.5 1997/05/21 23:07:31 jdp Exp $
  */
 
 #ifndef _SYS_IMGACT_ELF_H_
@@ -35,8 +35,6 @@
 
 #ifdef KERNEL
 
-extern int elf_trace;
-
 #define AUXARGS_ENTRY(pos, id, val) {suword(pos++, id); suword(pos++, val);}
 
 /*
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 98fcd21..1af8965 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: lockf.h,v 1.7 1997/02/22 09:45:31 peter Exp $
  */
 
 #ifndef _SYS_LOCKF_H_
@@ -67,8 +67,6 @@ struct lockf {
 int	 lf_advlock __P((struct vop_advlock_args *, struct lockf **, u_quad_t));
 
 #ifdef LOCKF_DEBUG
-extern int lockf_debug;
-
 void	lf_print __P((char *, struct lockf *));
 void	lf_printlist __P((char *, struct lockf *));
 #endif
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index e50fb16..cdffe79 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $Id: namei.h,v 1.14 1997/05/04 09:17:38 phk Exp $
+ * $Id: namei.h,v 1.15 1997/05/11 14:54:41 phk Exp $
  */
 
 #ifndef _SYS_NAMEI_H_
@@ -169,7 +169,6 @@ struct	namecache {
 
 #ifdef KERNEL
 extern u_long	nextvnodeid;
-extern u_long	numcache;
 extern u_long	numvnodes;
 
 int	namei __P((struct nameidata *ndp));
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index 667556d..ef3086a 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sem.h,v 1.12 1997/02/22 09:45:51 peter Exp $ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
@@ -145,7 +145,6 @@ extern struct seminfo	seminfo;
 
 extern struct semid_ds *sema;	/* semaphore id pool */
 extern struct sem *sem;		/* semaphore pool */
-extern struct sem_undo *semu_list; /* list of active undo structures */
 extern int	*semu;		/* undo structure pool */
 
 /*
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index b1d73bc..141521a 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $Id: sysctl.h,v 1.54 1997/07/12 11:12:41 peter Exp $
+ * $Id: sysctl.h,v 1.55 1997/08/29 09:03:40 kato Exp $
  */
 
 #ifndef _SYS_SYSCTL_H_
@@ -380,7 +380,6 @@ int sysctl_handle_opaque SYSCTL_HANDLER_ARGS;
 
 #ifdef KERNEL
 
-extern char	cpu_model[];
 extern char	machine[];
 extern char	osrelease[];
 extern char	ostype[];