summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/fxp/if_fxp.c14
-rw-r--r--sys/dev/lnc/if_lnc_pci.c3
-rw-r--r--sys/dev/pci/pci.c6
-rw-r--r--sys/dev/pdq/if_fpa.c28
-rw-r--r--sys/fs/cd9660/cd9660_bmap.c5
-rw-r--r--sys/fs/cd9660/cd9660_lookup.c4
-rw-r--r--sys/fs/cd9660/cd9660_node.c5
-rw-r--r--sys/fs/cd9660/cd9660_rrip.c8
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c3
-rw-r--r--sys/fs/fdescfs/fdesc_vfsops.c5
-rw-r--r--sys/fs/nullfs/null_subr.c5
-rw-r--r--sys/fs/nullfs/null_vfsops.c4
-rw-r--r--sys/fs/nullfs/null_vnops.c7
-rw-r--r--sys/fs/portalfs/portal_vfsops.c7
-rw-r--r--sys/fs/portalfs/portal_vnops.c4
-rw-r--r--sys/fs/procfs/procfs_ctl.c8
-rw-r--r--sys/fs/procfs/procfs_fpregs.c5
-rw-r--r--sys/fs/procfs/procfs_map.c17
-rw-r--r--sys/fs/procfs/procfs_mem.c4
-rw-r--r--sys/fs/procfs/procfs_note.c7
-rw-r--r--sys/fs/procfs/procfs_regs.c5
-rw-r--r--sys/fs/procfs/procfs_status.c5
-rw-r--r--sys/fs/procfs/procfs_subr.c4
-rw-r--r--sys/fs/procfs/procfs_type.c7
-rw-r--r--sys/fs/procfs/procfs_vfsops.c6
-rw-r--r--sys/fs/procfs/procfs_vnops.c4
-rw-r--r--sys/fs/umapfs/umap_subr.c5
-rw-r--r--sys/fs/umapfs/umap_vfsops.c4
-rw-r--r--sys/fs/umapfs/umap_vnops.c4
-rw-r--r--sys/fs/unionfs/union_subr.c5
-rw-r--r--sys/fs/unionfs/union_vfsops.c5
-rw-r--r--sys/isofs/cd9660/cd9660_bmap.c5
-rw-r--r--sys/isofs/cd9660/cd9660_lookup.c4
-rw-r--r--sys/isofs/cd9660/cd9660_node.c5
-rw-r--r--sys/isofs/cd9660/cd9660_rrip.c8
-rw-r--r--sys/isofs/cd9660/cd9660_vfsops.c3
-rw-r--r--sys/kern/imgact_shell.c5
-rw-r--r--sys/kern/inflate.c3
-rw-r--r--sys/kern/init_sysvec.c5
-rw-r--r--sys/kern/kern_conf.c3
-rw-r--r--sys/kern/kern_intr.c5
-rw-r--r--sys/kern/kern_linker.c5
-rw-r--r--sys/kern/kern_lkm.c6
-rw-r--r--sys/kern/kern_module.c4
-rw-r--r--sys/kern/kern_proc.c11
-rw-r--r--sys/kern/kern_prot.c5
-rw-r--r--sys/kern/link_aout.c8
-rw-r--r--sys/kern/md5c.c3
-rw-r--r--sys/kern/sys_socket.c7
-rw-r--r--sys/kern/sysv_msg.c4
-rw-r--r--sys/kern/sysv_sem.c4
-rw-r--r--sys/kern/sysv_shm.c5
-rw-r--r--sys/kern/tty_compat.c7
-rw-r--r--sys/kern/uipc_mbuf.c5
-rw-r--r--sys/kern/uipc_proto.c3
-rw-r--r--sys/kern/vfs_cluster.c6
-rw-r--r--sys/kern/vfs_init.c9
-rw-r--r--sys/libkern/strcmp.c3
-rw-r--r--sys/libkern/strcpy.c3
-rw-r--r--sys/libkern/strlen.c3
-rw-r--r--sys/libkern/strncmp.c3
-rw-r--r--sys/libkern/strncpy.c3
-rw-r--r--sys/miscfs/devfs/devfs_vfsops.c8
-rw-r--r--sys/miscfs/fdesc/fdesc_vfsops.c5
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c5
-rw-r--r--sys/miscfs/nullfs/null_subr.c5
-rw-r--r--sys/miscfs/nullfs/null_vfsops.c4
-rw-r--r--sys/miscfs/nullfs/null_vnops.c7
-rw-r--r--sys/miscfs/portal/portal_vfsops.c7
-rw-r--r--sys/miscfs/portal/portal_vnops.c4
-rw-r--r--sys/miscfs/procfs/procfs_ctl.c8
-rw-r--r--sys/miscfs/procfs/procfs_fpregs.c5
-rw-r--r--sys/miscfs/procfs/procfs_map.c17
-rw-r--r--sys/miscfs/procfs/procfs_mem.c4
-rw-r--r--sys/miscfs/procfs/procfs_note.c7
-rw-r--r--sys/miscfs/procfs/procfs_regs.c5
-rw-r--r--sys/miscfs/procfs/procfs_status.c5
-rw-r--r--sys/miscfs/procfs/procfs_subr.c4
-rw-r--r--sys/miscfs/procfs/procfs_type.c7
-rw-r--r--sys/miscfs/procfs/procfs_vfsops.c6
-rw-r--r--sys/miscfs/procfs/procfs_vnops.c4
-rw-r--r--sys/miscfs/umapfs/umap_subr.c5
-rw-r--r--sys/miscfs/umapfs/umap_vfsops.c4
-rw-r--r--sys/miscfs/umapfs/umap_vnops.c4
-rw-r--r--sys/miscfs/union/union_subr.c5
-rw-r--r--sys/miscfs/union/union_vfsops.c5
-rw-r--r--sys/net/bpf_filter.c4
-rw-r--r--sys/net/if_atmsubr.c12
-rw-r--r--sys/net/if_disc.c22
-rw-r--r--sys/net/if_fddisubr.c8
-rw-r--r--sys/net/if_loop.c7
-rw-r--r--sys/net/if_media.c4
-rw-r--r--sys/net/if_mib.c6
-rw-r--r--sys/net/if_sl.c5
-rw-r--r--sys/net/raw_usrreq.c8
-rw-r--r--sys/netatalk/ddp_pcb.c6
-rw-r--r--sys/netatalk/ddp_usrreq.c6
-rw-r--r--sys/netinet/if_atm.c12
-rw-r--r--sys/netinet/in.c7
-rw-r--r--sys/netinet/in_rmx.c13
-rw-r--r--sys/netinet/ip_divert.c4
-rw-r--r--sys/netinet/ip_fw.c5
-rw-r--r--sys/netinet/ip_icmp.c4
-rw-r--r--sys/netinet/ip_output.c4
-rw-r--r--sys/netinet/raw_ip.c4
-rw-r--r--sys/netinet/tcp_debug.c13
-rw-r--r--sys/netinet/tcp_output.c5
-rw-r--r--sys/netinet/tcp_timer.c8
-rw-r--r--sys/netinet/tcp_usrreq.c7
-rw-r--r--sys/netnatm/natm_pcb.c6
-rw-r--r--sys/netnatm/natm_proto.c4
-rw-r--r--sys/nfs/nfs_bio.c4
-rw-r--r--sys/nfs/nfs_node.c5
-rw-r--r--sys/nfs/nfs_srvcache.c8
-rw-r--r--sys/nfsclient/nfs_bio.c4
-rw-r--r--sys/nfsclient/nfs_node.c5
-rw-r--r--sys/nfsserver/nfs_srvcache.c8
-rw-r--r--sys/pci/bt9xx.c4
-rw-r--r--sys/pci/ide_pci.c6
-rw-r--r--sys/pci/if_fpa.c28
-rw-r--r--sys/pci/if_fxp.c14
-rw-r--r--sys/pci/if_lnc_p.c3
-rw-r--r--sys/pci/ncr.c8
-rw-r--r--sys/pci/pci.c6
-rw-r--r--sys/pci/pci_compat.c7
-rw-r--r--sys/pci/pcisupport.c3
-rw-r--r--sys/pci/wd82371.c7
-rw-r--r--sys/pci/wdc_p.c6
-rw-r--r--sys/scsi/ssc.c6
-rw-r--r--sys/scsi/uk.c3
-rw-r--r--sys/ufs/ffs/ffs_balloc.c6
-rw-r--r--sys/ufs/lfs/lfs_alloc.c4
-rw-r--r--sys/ufs/lfs/lfs_balloc.c6
-rw-r--r--sys/ufs/lfs/lfs_bio.c3
-rw-r--r--sys/ufs/lfs/lfs_debug.c5
-rw-r--r--sys/ufs/lfs/lfs_segment.c11
-rw-r--r--sys/ufs/lfs/lfs_subr.c3
-rw-r--r--sys/ufs/lfs/lfs_vfsops.c5
-rw-r--r--sys/ufs/mfs/mfs_vnops.c6
-rw-r--r--sys/ufs/ufs/ufs_quota.c5
-rw-r--r--sys/ufs/ufs/ufs_vfsops.c7
-rw-r--r--sys/vm/vm_init.c5
-rw-r--r--sys/vm/vm_kern.c6
-rw-r--r--sys/vm/vm_unix.c3
144 files changed, 141 insertions, 749 deletions
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 7873f3f..669bb1f 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_fxp.c,v 1.36 1997/06/16 04:45:57 davidg Exp $
+ * $Id: if_fxp.c,v 1.37 1997/07/25 23:41:12 davidg Exp $
*/
/*
@@ -43,22 +43,12 @@
#include <sys/syslog.h>
#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
#endif
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
#ifdef NS
#include <netns/ns.h>
#include <netns/ns_if.h>
@@ -66,11 +56,9 @@
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/vm_param.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
#include <machine/clock.h> /* for DELAY */
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index acd68a1..f1ec939 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -17,7 +17,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: if_lnc_p.c,v 1.3 1997/02/22 09:44:06 peter Exp $
+ * $Id: if_lnc_p.c,v 1.4 1997/04/04 16:44:52 kato Exp $
*/
#include "pci.h"
@@ -29,7 +29,6 @@
#include <sys/kernel.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
-#include <i386/isa/isa_device.h>
#include "lnc.h"
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index e197ee6..bb5a0f8 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,18 +23,14 @@
* (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: pci.c,v 1.2 1997/06/25 20:16:02 smp Exp smp $
+ * $Id: pci.c,v 1.77 1997/06/25 20:56:29 fsmp Exp $
*
*/
#include "pci.h"
#if NPCI > 0
-#include <stddef.h>
-
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/time.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/fcntl.h>
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 6bd8037..0dab356 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,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: if_fpa.c,v 1.2 1997/01/17 23:54:42 joerg Exp $
+ * $Id: if_fpa.c,v 1.3 1997/03/24 11:24:51 bde Exp $
*
*/
@@ -34,44 +34,21 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
#if defined(__bsdi__) || defined(__NetBSD__)
#include <sys/device.h>
#endif
#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include "bpfilter.h"
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-#endif
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
-#if defined(__FreeBSD__)
-#include <netinet/if_fddi.h>
-#else
-#include <net/if_fddi.h>
-#endif
-
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_param.h>
#if defined(__FreeBSD__)
#include "fpa.h"
#include <pci/pcivar.h>
-#include <i386/isa/icu.h>
#include <dev/pdq/pdqvar.h>
#include <dev/pdq/pdqreg.h>
#elif defined(__bsdi__)
@@ -83,9 +60,6 @@
#if _BSDI_VERSION < 199401
#define IRQSHARE 0
#endif
-#include <i386/pci/pci.h>
-#include <dev/pdq/pdqvar.h>
-#include <dev/pdq/pdqreg.h>
#elif defined(__NetBSD__)
#include <dev/pci/pcivar.h>
#include <dev/ic/pdqvar.h>
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index 043e806..e787f83 100644
--- a/sys/fs/cd9660/cd9660_bmap.c
+++ b/sys/fs/cd9660/cd9660_bmap.c
@@ -36,13 +36,10 @@
* SUCH DAMAGE.
*
* @(#)cd9660_bmap.c 8.3 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_bmap.c,v 1.6 1997/02/22 09:38:47 peter Exp $
*/
#include <sys/param.h>
-#include <sys/namei.h>
-#include <sys/buf.h>
-#include <sys/file.h>
#include <sys/vnode.h>
#include <sys/mount.h>
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index b2399e7..94fe78e 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,21 +38,19 @@
* from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91
*
* @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.14 1997/02/22 09:38:48 peter Exp $
+ * $Id: cd9660_lookup.c,v 1.15 1997/03/08 16:09:38 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
#include <sys/buf.h>
-#include <sys/file.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/iso_rrip.h>
-#include <isofs/cd9660/cd9660_rrip.h>
/*
* Convert a component of a pathname into a pointer to a locked inode.
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index a75a956..8db9633 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,24 +36,21 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.18 1997/02/22 09:38:48 peter Exp $
+ * $Id: cd9660_node.c,v 1.19 1997/04/14 18:15:45 phk Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
#include <sys/proc.h>
-#include <sys/file.h>
#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/stat.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/cd9660_mount.h>
-#include <isofs/cd9660/iso_rrip.h>
/*
* Structures associated with iso_node caching.
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index b54a1d0..b34553f 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -36,21 +36,15 @@
* SUCH DAMAGE.
*
* @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94
- * $Id$
+ * $Id: cd9660_rrip.c,v 1.12 1997/02/22 09:38:49 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
#include <sys/buf.h>
-#include <sys/file.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/kernel.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <sys/time.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_node.h>
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index a61ccfc..cf09054 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.24 1997/04/29 17:11:51 joerg Exp $
+ * $Id: cd9660_vfsops.c,v 1.25 1997/05/04 15:24:21 joerg Exp $
*/
#include <sys/param.h>
@@ -51,7 +51,6 @@
#include <sys/cdio.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/stat.h>
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 214a898..ea668c9 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -35,7 +35,7 @@
*
* @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94
*
- * $Id$
+ * $Id: fdesc_vfsops.c,v 1.10 1997/02/22 09:40:15 peter Exp $
*/
/*
@@ -45,14 +45,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
#include <sys/filedesc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
#include <miscfs/fdesc/fdesc.h>
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 5ba2aa8..0cb47a5 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -35,17 +35,14 @@
*
* @(#)null_subr.c 8.7 (Berkeley) 5/14/95
*
- * $Id: null_subr.c,v 1.9 1997/02/22 09:40:21 peter Exp $
+ * $Id: null_subr.c,v 1.10 1997/04/17 11:17:28 kato Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
#include <miscfs/nullfs/null.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 8f3ca4d..40e2a19 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
* @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
*
* @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.16 1997/04/17 11:24:57 kato Exp $
+ * $Id: null_vfsops.c,v 1.17 1997/04/19 06:03:30 kato Exp $
*/
/*
@@ -48,8 +48,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index c2eaeaf..04e96d0 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
- * $Id: null_vnops.c,v 1.19 1997/06/26 16:13:56 alex Exp $
+ * $Id: null_vnops.c,v 1.20 1997/06/26 17:12:59 alex Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*
- * $Id: null_vnops.c,v 1.19 1997/06/26 16:13:56 alex Exp $
+ * $Id: null_vnops.c,v 1.20 1997/06/26 17:12:59 alex Exp $
*/
/*
@@ -178,9 +178,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 6b0be7d..7ab3be6 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95
*
- * $Id$
+ * $Id: portal_vfsops.c,v 1.15 1997/02/22 09:40:24 peter Exp $
*/
/*
@@ -45,21 +45,16 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/proc.h>
#include <sys/filedesc.h>
#include <sys/file.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
-#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/protosw.h>
#include <sys/domain.h>
-#include <sys/un.h>
#include <miscfs/portal/portal.h>
static int portal_init __P((struct vfsconf *));
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index b8118a8..edd4217 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95
*
- * $Id: portal_vnops.c,v 1.17 1997/02/22 09:40:25 peter Exp $
+ * $Id: portal_vnops.c,v 1.18 1997/03/23 03:36:54 bde Exp $
*/
/*
@@ -46,7 +46,6 @@
#include <sys/systm.h>
#include <sys/sysproto.h>
#include <sys/kernel.h>
-#include <sys/types.h>
#include <sys/time.h>
#include <sys/proc.h>
#include <sys/filedesc.h>
@@ -62,7 +61,6 @@
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/un.h>
-#include <sys/unpcb.h>
#include <miscfs/portal/portal.h>
static int portal_fileid = PORTAL_ROOTFILEID+1;
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index da3cb15..21724e5 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -37,21 +37,15 @@
* @(#)procfs_ctl.c 8.4 (Berkeley) 6/15/94
*
* From:
- * $Id: procfs_ctl.c,v 1.15 1997/04/27 19:02:37 alex Exp $
+ * $Id: procfs_ctl.c,v 1.16 1997/04/27 21:32:21 alex Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
-#include <sys/signal.h>
#include <sys/signalvar.h>
-#include <sys/ptrace.h>
#include <miscfs/procfs/procfs.h>
#include <vm/vm.h>
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 1930141..c3e5f0b 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -37,13 +37,10 @@
* @(#)procfs_fpregs.c 8.2 (Berkeley) 6/15/94
*
* From:
- * $Id$
+ * $Id: procfs_fpregs.c,v 1.6 1997/02/22 09:40:27 peter Exp $
*/
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <machine/reg.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index b4c25bf..5c12b19 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -36,37 +36,22 @@
*
* @(#)procfs_status.c 8.3 (Berkeley) 2/17/94
*
- * $Id: procfs_map.c,v 1.10 1997/02/22 09:40:28 peter Exp $
+ * $Id: procfs_map.c,v 1.11 1997/03/24 11:24:41 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <sys/tty.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
#include <miscfs/procfs/procfs.h>
-#include <sys/queue.h>
-#include <sys/vmmeter.h>
-#include <sys/mman.h>
-#include <sys/malloc.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_prot.h>
-#include <vm/vm_inherit.h>
#include <sys/lock.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
-#include <vm/default_pager.h>
#define MEBUFFERSIZE 256
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index ef049bd..97b7d9b 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
*
* @(#)procfs_mem.c 8.5 (Berkeley) 6/15/94
*
- * $Id: procfs_mem.c,v 1.24 1997/04/06 02:29:31 dyson Exp $
+ * $Id: procfs_mem.c,v 1.25 1997/04/20 17:12:11 dyson Exp $
*/
/*
@@ -47,8 +47,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <miscfs/procfs/procfs.h>
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index aca4727..8bfde33 100644
--- a/sys/fs/procfs/procfs_note.c
+++ b/sys/fs/procfs/procfs_note.c
@@ -36,16 +36,11 @@
*
* @(#)procfs_note.c 8.2 (Berkeley) 1/21/94
*
- * $Id$
+ * $Id: procfs_note.c,v 1.4 1997/02/22 09:40:28 peter Exp $
*/
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/vnode.h>
-#include <sys/signal.h>
#include <miscfs/procfs/procfs.h>
int
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index cc00319..276c5ed 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -37,13 +37,10 @@
* @(#)procfs_regs.c 8.4 (Berkeley) 6/15/94
*
* From:
- * $Id$
+ * $Id: procfs_regs.c,v 1.6 1997/02/22 09:40:29 peter Exp $
*/
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <machine/reg.h>
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index c9ece43..73de95a 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -37,17 +37,14 @@
* @(#)procfs_status.c 8.4 (Berkeley) 6/15/94
*
* From:
- * $Id: procfs_status.c,v 1.8 1997/02/22 09:40:29 peter Exp $
+ * $Id: procfs_status.c,v 1.9 1997/03/24 11:24:42 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/tty.h>
-#include <sys/resource.h>
#include <sys/resourcevar.h>
#include <miscfs/procfs/procfs.h>
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index 4793a7f..42e9bf4 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -36,13 +36,11 @@
*
* @(#)procfs_subr.c 8.6 (Berkeley) 5/14/95
*
- * $Id: procfs_subr.c,v 1.15 1997/06/21 16:09:49 alex Exp $
+ * $Id: procfs_subr.c,v 1.16 1997/06/26 16:12:53 alex Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index bdb83d5..8f85c54 100644
--- a/sys/fs/procfs/procfs_type.c
+++ b/sys/fs/procfs/procfs_type.c
@@ -34,19 +34,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: procfs_type.c,v 1.3 1997/02/22 09:40:30 peter Exp $
+ * $Id: procfs_type.c,v 1.4 1997/03/24 11:24:42 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/sysent.h>
#include <sys/vnode.h>
-#include <sys/tty.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
#include <miscfs/procfs/procfs.h>
int
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index dfd7611..a6ebbae 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
*
* @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95
*
- * $Id$
+ * $Id: procfs_vfsops.c,v 1.15 1997/02/22 09:40:31 peter Exp $
*/
/*
@@ -45,16 +45,12 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/buf.h>
#include <sys/syslog.h>
#include <sys/mount.h>
-#include <sys/signalvar.h>
#include <sys/vnode.h>
#include <miscfs/procfs/procfs.h>
-#include <vm/vm.h> /* for PAGE_SIZE */
static int procfs_init __P((struct vfsconf *vfsp));
static int procfs_mount __P((struct mount *mp, char *path, caddr_t data,
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index e2834b2..77f2e49 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
- * $Id: procfs_vnops.c,v 1.28 1997/02/22 09:40:31 peter Exp $
+ * $Id: procfs_vnops.c,v 1.29 1997/02/24 16:44:11 bde Exp $
*/
/*
@@ -54,8 +54,6 @@
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/dirent.h>
-#include <sys/resourcevar.h>
-#include <vm/vm.h> /* for PAGE_SIZE */
#include <machine/reg.h>
#include <miscfs/procfs/procfs.h>
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 6f5296e..a74b3eb 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -35,17 +35,14 @@
*
* @(#)umap_subr.c 8.9 (Berkeley) 5/14/95
*
- * $Id$
+ * $Id: umap_subr.c,v 1.10 1997/02/22 09:40:37 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
#include <miscfs/umapfs/umap.h>
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 511970f..3a73bd6 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
*
* @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95
*
- * $Id$
+ * $Id: umap_vfsops.c,v 1.14 1997/02/22 09:40:38 peter Exp $
*/
/*
@@ -47,8 +47,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 5266853..2eb8ab2 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.16 1997/02/22 09:40:38 peter Exp $
+ * $Id: umap_vnops.c,v 1.17 1997/05/25 04:50:01 peter Exp $
*/
/*
@@ -45,8 +45,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index b05197c..493a172 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,19 +35,16 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.17 1997/04/13 06:27:09 phk Exp $
+ * $Id: union_subr.c,v 1.18 1997/04/16 16:24:24 kato Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/fcntl.h>
#include <sys/filedesc.h>
-#include <sys/queue.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <vm/vm.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 33f2525..82edf91 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.16 1997/04/19 06:04:13 kato Exp $
+ * $Id: union_vfsops.c,v 1.17 1997/05/07 14:37:31 kato Exp $
*/
/*
@@ -45,15 +45,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/filedesc.h>
-#include <sys/queue.h>
#include <miscfs/union/union.h>
extern int union_init __P((struct vfsconf *));
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index 043e806..e787f83 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -36,13 +36,10 @@
* SUCH DAMAGE.
*
* @(#)cd9660_bmap.c 8.3 (Berkeley) 1/23/94
- * $Id$
+ * $Id: cd9660_bmap.c,v 1.6 1997/02/22 09:38:47 peter Exp $
*/
#include <sys/param.h>
-#include <sys/namei.h>
-#include <sys/buf.h>
-#include <sys/file.h>
#include <sys/vnode.h>
#include <sys/mount.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index b2399e7..94fe78e 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -38,21 +38,19 @@
* from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91
*
* @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.14 1997/02/22 09:38:48 peter Exp $
+ * $Id: cd9660_lookup.c,v 1.15 1997/03/08 16:09:38 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
#include <sys/buf.h>
-#include <sys/file.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/iso_rrip.h>
-#include <isofs/cd9660/cd9660_rrip.h>
/*
* Convert a component of a pathname into a pointer to a locked inode.
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index a75a956..8db9633 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,24 +36,21 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.18 1997/02/22 09:38:48 peter Exp $
+ * $Id: cd9660_node.c,v 1.19 1997/04/14 18:15:45 phk Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
#include <sys/proc.h>
-#include <sys/file.h>
#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/stat.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/cd9660_mount.h>
-#include <isofs/cd9660/iso_rrip.h>
/*
* Structures associated with iso_node caching.
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index b54a1d0..b34553f 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -36,21 +36,15 @@
* SUCH DAMAGE.
*
* @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94
- * $Id$
+ * $Id: cd9660_rrip.c,v 1.12 1997/02/22 09:38:49 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
#include <sys/buf.h>
-#include <sys/file.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/kernel.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <sys/time.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_node.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index a61ccfc..cf09054 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.24 1997/04/29 17:11:51 joerg Exp $
+ * $Id: cd9660_vfsops.c,v 1.25 1997/05/04 15:24:21 joerg Exp $
*/
#include <sys/param.h>
@@ -51,7 +51,6 @@
#include <sys/cdio.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/stat.h>
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index 526aac7..c4d04b5 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -23,17 +23,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: imgact_shell.c,v 1.14 1997/02/22 09:38:57 peter Exp $
+ * $Id: imgact_shell.c,v 1.15 1997/04/23 22:07:04 ache Exp $
*/
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/sysproto.h>
-#include <sys/resourcevar.h>
#include <sys/exec.h>
#include <sys/imgact.h>
#include <sys/kernel.h>
-#include <machine/endian.h>
#if BYTE_ORDER == LITTLE_ENDIAN
#define SHELLMAGIC 0x2123 /* #! */
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 2024bc1..e462198 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -7,7 +7,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id$
+ * $Id: inflate.c,v 1.8 1997/02/22 09:38:58 peter Exp $
*
*
*/
@@ -17,7 +17,6 @@
#ifdef KERNEL
#include <sys/systm.h>
#endif
-#include <sys/mman.h>
#include <sys/malloc.h>
/* needed to make inflate() work */
diff --git a/sys/kern/init_sysvec.c b/sys/kern/init_sysvec.c
index 379a1bf..3e20383 100644
--- a/sys/kern/init_sysvec.c
+++ b/sys/kern/init_sysvec.c
@@ -1,14 +1,11 @@
/*
* sysentvec for native FreeBSD a.out executable format.
*
- * $Id$
+ * $Id: init_sysvec.c,v 1.4 1997/02/22 09:38:59 peter Exp $
*/
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/mount.h>
#include <sys/sysent.h>
-#include <sys/sysproto.h>
#include <sys/syscall.h>
#include <sys/signalvar.h>
#include <machine/md_var.h>
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 8d03d23..f7db620 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -30,11 +30,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: kern_conf.c,v 1.16 1997/02/22 09:39:03 peter Exp $
+ * $Id: kern_conf.c,v 1.17 1997/06/02 04:56:38 julian Exp $
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/vnode.h>
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 27d20c9..3801665 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -23,13 +23,12 @@
* (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: kern_intr.c,v 1.7 1997/06/08 17:15:22 ache Exp $
+ * $Id: kern_intr.c,v 1.8 1997/07/09 18:06:25 ache Exp $
*
*/
#include <sys/types.h>
#include <sys/malloc.h>
-#include <sys/time.h>
#include <sys/systm.h>
#include <sys/errno.h>
#ifdef RESOURCE_CHECK
@@ -44,8 +43,6 @@
#include <stddef.h>
-#include "vector.h"
-
typedef struct intrec {
intrmask_t mask;
inthand2_t *handler;
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 2a4e6cd..08c20ae 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -23,15 +23,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: kern_linker.c,v 1.1 1997/05/07 16:05:30 dfr Exp $
*/
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/libkern.h>
#include <sys/malloc.h>
#include <sys/sysproto.h>
#include <sys/sysent.h>
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 5d856ae..738de5b 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: kern_lkm.c,v 1.39 1997/03/24 11:24:35 bde Exp $
+ * $Id: kern_lkm.c,v 1.40 1997/04/06 11:08:19 dufault Exp $
*/
#include <sys/param.h>
@@ -39,14 +39,11 @@
#include <sys/tty.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
-#include <sys/proc.h>
-#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/sysent.h>
#include <sys/exec.h>
-#include <sys/imgact.h>
#include <sys/lkm.h>
#include <sys/vnode.h>
#ifdef DEVFS
@@ -54,7 +51,6 @@
#endif /*DEVFS*/
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 8a4048a..fa631a7 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -23,15 +23,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: kern_module.c,v 1.1 1997/05/07 16:05:31 dfr Exp $
*/
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/sysctl.h>
#include <sys/queue.h>
-#include <sys/libkern.h>
#include <sys/malloc.h>
#include <sys/sysproto.h>
#include <sys/sysent.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 9ddcaab..21c153f 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)kern_proc.c 8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.26 1997/03/24 11:24:36 bde Exp $
+ * $Id: kern_proc.c,v 1.27 1997/06/27 15:42:05 tegge Exp $
*/
#include <sys/param.h>
@@ -39,19 +39,10 @@
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/proc.h>
-#include <sys/buf.h>
-#include <sys/acct.h>
-#include <sys/wait.h>
-#include <sys/file.h>
-#include <ufs/ufs/quota.h>
-#include <sys/uio.h>
#include <sys/malloc.h>
-#include <sys/mbuf.h>
#include <sys/tty.h>
#include <sys/signalvar.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_prot.h>
#include <sys/lock.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 27db363..7843b7a 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_prot.c 8.6 (Berkeley) 1/21/94
- * $Id: kern_prot.c,v 1.31 1997/03/31 15:13:33 peter Exp $
+ * $Id: kern_prot.c,v 1.32 1997/04/02 17:05:49 peter Exp $
*/
/*
@@ -47,10 +47,7 @@
#include <sys/acct.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
-#include <sys/ucred.h>
#include <sys/proc.h>
-#include <sys/timeb.h>
-#include <sys/times.h>
#include <sys/malloc.h>
#include <sys/unistd.h>
diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c
index 5fd3f87..662a4a9 100644
--- a/sys/kern/link_aout.c
+++ b/sys/kern/link_aout.c
@@ -23,17 +23,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: link_aout.c,v 1.1 1997/05/07 16:05:32 dfr Exp $
*/
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-#include <sys/libkern.h>
#include <sys/malloc.h>
-#include <sys/sysproto.h>
#include <sys/proc.h>
#include <sys/namei.h>
#include <sys/fcntl.h>
@@ -41,8 +37,6 @@
#include <sys/linker.h>
#include <a.out.h>
#include <link.h>
-#include <machine/reloc.h>
-#include <sys/imgact_aout.h>
static int link_aout_load_file(const char*, linker_file_t*);
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index 583d009..24dca79 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -22,7 +22,7 @@
* These notices must be retained in any copies of any part of this
* documentation and/or software.
*
- * $Id$
+ * $Id: md5c.c,v 1.8 1997/02/22 09:39:14 peter Exp $
*
* This code is the same as the code published by RSA Inc. It has been
* edited for clarity and style only.
@@ -31,7 +31,6 @@
#include <sys/types.h>
#ifdef KERNEL
-#include <sys/param.h>
#include <sys/systm.h>
#else
#include <string.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 0c3b495..8e9e90e 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,19 +31,14 @@
* SUCH DAMAGE.
*
* @(#)sys_socket.c 8.1 (Berkeley) 6/10/93
- * $Id: sys_socket.c,v 1.12 1997/03/24 11:52:26 bde Exp $
+ * $Id: sys_socket.c,v 1.13 1997/04/27 20:00:42 wollman Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/fcntl.h>
#include <sys/file.h>
-#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
-#include <sys/stat.h>
#include <sys/socketvar.h>
#include <sys/filio.h> /* XXX */
#include <sys/sockio.h>
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index d6e695f..1766d8f 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sysv_msg.c,v 1.15 1997/02/22 09:39:22 peter Exp $ */
/*
* Implementation of SVID messages
@@ -19,8 +19,6 @@
* This software is provided ``AS IS'' without any warranties of any kind.
*/
-#include "opt_sysvipc.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index e66ddc6..a7f3a06 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sysv_sem.c,v 1.18 1997/02/22 09:39:22 peter Exp $ */
/*
* Implementation of SVID semaphores
@@ -8,8 +8,6 @@
* This software is provided ``AS IS'' without any warranties of any kind.
*/
-#include "opt_sysvipc.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 9e93923..be68b1b 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: sysv_shm.c,v 1.28 1997/02/22 09:39:23 peter Exp $ */
/* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */
/*
@@ -31,7 +31,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "opt_sysvipc.h"
#include "opt_rlimit.h"
#include <sys/param.h>
@@ -52,8 +51,6 @@
#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_map.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
#include <vm/vm_pager.h>
#include <vm/vm_inherit.h>
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index ed58c6a..71959cd 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tty_compat.c 8.1 (Berkeley) 6/10/93
- * $Id: tty_compat.c,v 1.21 1997/02/22 09:39:24 peter Exp $
+ * $Id: tty_compat.c,v 1.22 1997/03/24 12:03:03 bde Exp $
*/
/*
@@ -42,14 +42,9 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/ioctl_compat.h>
-#include <sys/proc.h>
#include <sys/tty.h>
-#include <sys/termios.h>
-#include <sys/file.h>
-#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/syslog.h>
static int ttcompatgetflags __P((struct tty *tp));
static void ttcompatsetflags __P((struct tty *tp, struct termios *t));
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 7032e44..a2551bf 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,23 +31,20 @@
* SUCH DAMAGE.
*
* @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94
- * $Id: uipc_mbuf.c,v 1.28 1997/02/18 20:43:05 wollman Exp $
+ * $Id: uipc_mbuf.c,v 1.29 1997/02/24 20:30:55 wollman Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#define MBTYPES
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/syslog.h>
#include <sys/domain.h>
#include <sys/protosw.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index bcd918c..c5bae86 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,13 +31,12 @@
* SUCH DAMAGE.
*
* @(#)uipc_proto.c 8.1 (Berkeley) 6/10/93
- * $Id: uipc_proto.c,v 1.11 1997/04/14 18:23:48 phk Exp $
+ * $Id: uipc_proto.c,v 1.12 1997/04/27 20:00:43 wollman Exp $
*/
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/domain.h>
-#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 5f926b9..304d4d3 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.46 1997/04/25 11:14:00 dfr Exp $
+ * $Id: vfs_cluster.c,v 1.47 1997/06/15 17:56:49 dyson Exp $
*/
#include <sys/param.h>
@@ -42,12 +42,8 @@
#include <sys/buf.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/resourcevar.h>
-#include <sys/vmmeter.h>
-#include <miscfs/specfs/specdev.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_prot.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 21061e8..5754b62 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_init.c 8.3 (Berkeley) 1/4/94
- * $Id: vfs_init.c,v 1.24 1997/02/22 09:39:32 peter Exp $
+ * $Id: vfs_init.c,v 1.25 1997/03/02 11:06:21 bde Exp $
*/
@@ -44,15 +44,8 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/time.h>
#include <sys/vnode.h>
-#include <sys/stat.h>
-#include <sys/namei.h>
-#include <sys/ucred.h>
-#include <sys/buf.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
-#include <sys/proc.h>
static void vfs_op_init __P((void));
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 69c482c..494e21f 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -33,10 +33,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: strcmp.c,v 1.5 1997/02/22 09:40:02 peter Exp $
*/
-#include <sys/cdefs.h>
#include <string.h>
/*
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index 2715720..b9b5d4e 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -30,10 +30,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: strcpy.c,v 1.4 1997/02/22 09:40:02 peter Exp $
*/
-#include <sys/cdefs.h>
#include <string.h>
char *
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index 1d1352c..52e0da1 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -30,10 +30,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: strlen.c,v 1.4 1997/02/22 09:40:03 peter Exp $
*/
-#include <sys/cdefs.h>
#include <string.h>
size_t
diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c
index 4804db3..d089d89 100644
--- a/sys/libkern/strncmp.c
+++ b/sys/libkern/strncmp.c
@@ -30,10 +30,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: strncmp.c,v 1.5 1997/02/22 09:40:03 peter Exp $
*/
-#include <sys/cdefs.h>
#include <string.h>
int
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 8aea690..44ebc0e 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -33,10 +33,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: strncpy.c,v 1.4 1997/02/22 09:40:04 peter Exp $
*/
-#include <sys/cdefs.h>
#include <string.h>
/*
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index 86d91ad..06e0501 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -1,26 +1,20 @@
/*
* Written by Julian Elischer (julian@DIALix.oz.au)
*
- * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.17 1997/05/03 21:19:54 joerg Exp $
+ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.18 1997/07/14 04:30:22 julian Exp $
*
*
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
-#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/buf.h>
-#include <sys/file.h>
#include <sys/malloc.h>
#include <miscfs/devfs/devfsdefs.h>
-#include <miscfs/specfs/specdev.h> /* defines v_rdev */
-
static int devfs_statfs( struct mount *mp, struct statfs *sbp, struct proc *p);
static int mountdevfs( struct mount *mp, struct proc *p);
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index 214a898..ea668c9 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -35,7 +35,7 @@
*
* @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94
*
- * $Id$
+ * $Id: fdesc_vfsops.c,v 1.10 1997/02/22 09:40:15 peter Exp $
*/
/*
@@ -45,14 +45,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
#include <sys/filedesc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
#include <miscfs/fdesc/fdesc.h>
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 53ae559..57f1538 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95
- * $Id$
+ * $Id: kernfs_vfsops.c,v 1.18 1997/02/22 09:40:19 peter Exp $
*/
/*
@@ -45,14 +45,11 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
-#include <sys/types.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
-#include <miscfs/specfs/specdev.h>
#include <miscfs/kernfs/kernfs.h>
dev_t rrootdev = NODEV;
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index 5ba2aa8..0cb47a5 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,17 +35,14 @@
*
* @(#)null_subr.c 8.7 (Berkeley) 5/14/95
*
- * $Id: null_subr.c,v 1.9 1997/02/22 09:40:21 peter Exp $
+ * $Id: null_subr.c,v 1.10 1997/04/17 11:17:28 kato Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
#include <miscfs/nullfs/null.h>
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 8f3ca4d..40e2a19 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
* @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
*
* @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.16 1997/04/17 11:24:57 kato Exp $
+ * $Id: null_vfsops.c,v 1.17 1997/04/19 06:03:30 kato Exp $
*/
/*
@@ -48,8 +48,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index c2eaeaf..04e96d0 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
- * $Id: null_vnops.c,v 1.19 1997/06/26 16:13:56 alex Exp $
+ * $Id: null_vnops.c,v 1.20 1997/06/26 17:12:59 alex Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*
- * $Id: null_vnops.c,v 1.19 1997/06/26 16:13:56 alex Exp $
+ * $Id: null_vnops.c,v 1.20 1997/06/26 17:12:59 alex Exp $
*/
/*
@@ -178,9 +178,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 6b0be7d..7ab3be6 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95
*
- * $Id$
+ * $Id: portal_vfsops.c,v 1.15 1997/02/22 09:40:24 peter Exp $
*/
/*
@@ -45,21 +45,16 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/proc.h>
#include <sys/filedesc.h>
#include <sys/file.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
-#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/protosw.h>
#include <sys/domain.h>
-#include <sys/un.h>
#include <miscfs/portal/portal.h>
static int portal_init __P((struct vfsconf *));
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index b8118a8..edd4217 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95
*
- * $Id: portal_vnops.c,v 1.17 1997/02/22 09:40:25 peter Exp $
+ * $Id: portal_vnops.c,v 1.18 1997/03/23 03:36:54 bde Exp $
*/
/*
@@ -46,7 +46,6 @@
#include <sys/systm.h>
#include <sys/sysproto.h>
#include <sys/kernel.h>
-#include <sys/types.h>
#include <sys/time.h>
#include <sys/proc.h>
#include <sys/filedesc.h>
@@ -62,7 +61,6 @@
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/un.h>
-#include <sys/unpcb.h>
#include <miscfs/portal/portal.h>
static int portal_fileid = PORTAL_ROOTFILEID+1;
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index da3cb15..21724e5 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -37,21 +37,15 @@
* @(#)procfs_ctl.c 8.4 (Berkeley) 6/15/94
*
* From:
- * $Id: procfs_ctl.c,v 1.15 1997/04/27 19:02:37 alex Exp $
+ * $Id: procfs_ctl.c,v 1.16 1997/04/27 21:32:21 alex Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
-#include <sys/signal.h>
#include <sys/signalvar.h>
-#include <sys/ptrace.h>
#include <miscfs/procfs/procfs.h>
#include <vm/vm.h>
diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c
index 1930141..c3e5f0b 100644
--- a/sys/miscfs/procfs/procfs_fpregs.c
+++ b/sys/miscfs/procfs/procfs_fpregs.c
@@ -37,13 +37,10 @@
* @(#)procfs_fpregs.c 8.2 (Berkeley) 6/15/94
*
* From:
- * $Id$
+ * $Id: procfs_fpregs.c,v 1.6 1997/02/22 09:40:27 peter Exp $
*/
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <machine/reg.h>
diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c
index b4c25bf..5c12b19 100644
--- a/sys/miscfs/procfs/procfs_map.c
+++ b/sys/miscfs/procfs/procfs_map.c
@@ -36,37 +36,22 @@
*
* @(#)procfs_status.c 8.3 (Berkeley) 2/17/94
*
- * $Id: procfs_map.c,v 1.10 1997/02/22 09:40:28 peter Exp $
+ * $Id: procfs_map.c,v 1.11 1997/03/24 11:24:41 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <sys/tty.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
#include <miscfs/procfs/procfs.h>
-#include <sys/queue.h>
-#include <sys/vmmeter.h>
-#include <sys/mman.h>
-#include <sys/malloc.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_prot.h>
-#include <vm/vm_inherit.h>
#include <sys/lock.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_pager.h>
-#include <vm/vm_extern.h>
-#include <vm/default_pager.h>
#define MEBUFFERSIZE 256
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index ef049bd..97b7d9b 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
*
* @(#)procfs_mem.c 8.5 (Berkeley) 6/15/94
*
- * $Id: procfs_mem.c,v 1.24 1997/04/06 02:29:31 dyson Exp $
+ * $Id: procfs_mem.c,v 1.25 1997/04/20 17:12:11 dyson Exp $
*/
/*
@@ -47,8 +47,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <miscfs/procfs/procfs.h>
diff --git a/sys/miscfs/procfs/procfs_note.c b/sys/miscfs/procfs/procfs_note.c
index aca4727..8bfde33 100644
--- a/sys/miscfs/procfs/procfs_note.c
+++ b/sys/miscfs/procfs/procfs_note.c
@@ -36,16 +36,11 @@
*
* @(#)procfs_note.c 8.2 (Berkeley) 1/21/94
*
- * $Id$
+ * $Id: procfs_note.c,v 1.4 1997/02/22 09:40:28 peter Exp $
*/
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/vnode.h>
-#include <sys/signal.h>
#include <miscfs/procfs/procfs.h>
int
diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c
index cc00319..276c5ed 100644
--- a/sys/miscfs/procfs/procfs_regs.c
+++ b/sys/miscfs/procfs/procfs_regs.c
@@ -37,13 +37,10 @@
* @(#)procfs_regs.c 8.4 (Berkeley) 6/15/94
*
* From:
- * $Id$
+ * $Id: procfs_regs.c,v 1.6 1997/02/22 09:40:29 peter Exp $
*/
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <machine/reg.h>
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index c9ece43..73de95a 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -37,17 +37,14 @@
* @(#)procfs_status.c 8.4 (Berkeley) 6/15/94
*
* From:
- * $Id: procfs_status.c,v 1.8 1997/02/22 09:40:29 peter Exp $
+ * $Id: procfs_status.c,v 1.9 1997/03/24 11:24:42 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/tty.h>
-#include <sys/resource.h>
#include <sys/resourcevar.h>
#include <miscfs/procfs/procfs.h>
diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c
index 4793a7f..42e9bf4 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -36,13 +36,11 @@
*
* @(#)procfs_subr.c 8.6 (Berkeley) 5/14/95
*
- * $Id: procfs_subr.c,v 1.15 1997/06/21 16:09:49 alex Exp $
+ * $Id: procfs_subr.c,v 1.16 1997/06/26 16:12:53 alex Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
diff --git a/sys/miscfs/procfs/procfs_type.c b/sys/miscfs/procfs/procfs_type.c
index bdb83d5..8f85c54 100644
--- a/sys/miscfs/procfs/procfs_type.c
+++ b/sys/miscfs/procfs/procfs_type.c
@@ -34,19 +34,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: procfs_type.c,v 1.3 1997/02/22 09:40:30 peter Exp $
+ * $Id: procfs_type.c,v 1.4 1997/03/24 11:24:42 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/sysent.h>
#include <sys/vnode.h>
-#include <sys/tty.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
#include <miscfs/procfs/procfs.h>
int
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index dfd7611..a6ebbae 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
*
* @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95
*
- * $Id$
+ * $Id: procfs_vfsops.c,v 1.15 1997/02/22 09:40:31 peter Exp $
*/
/*
@@ -45,16 +45,12 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/buf.h>
#include <sys/syslog.h>
#include <sys/mount.h>
-#include <sys/signalvar.h>
#include <sys/vnode.h>
#include <miscfs/procfs/procfs.h>
-#include <vm/vm.h> /* for PAGE_SIZE */
static int procfs_init __P((struct vfsconf *vfsp));
static int procfs_mount __P((struct mount *mp, char *path, caddr_t data,
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index e2834b2..77f2e49 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
- * $Id: procfs_vnops.c,v 1.28 1997/02/22 09:40:31 peter Exp $
+ * $Id: procfs_vnops.c,v 1.29 1997/02/24 16:44:11 bde Exp $
*/
/*
@@ -54,8 +54,6 @@
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/dirent.h>
-#include <sys/resourcevar.h>
-#include <vm/vm.h> /* for PAGE_SIZE */
#include <machine/reg.h>
#include <miscfs/procfs/procfs.h>
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index 6f5296e..a74b3eb 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -35,17 +35,14 @@
*
* @(#)umap_subr.c 8.9 (Berkeley) 5/14/95
*
- * $Id$
+ * $Id: umap_subr.c,v 1.10 1997/02/22 09:40:37 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/malloc.h>
#include <miscfs/umapfs/umap.h>
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 511970f..3a73bd6 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
*
* @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95
*
- * $Id$
+ * $Id: umap_vfsops.c,v 1.14 1997/02/22 09:40:38 peter Exp $
*/
/*
@@ -47,8 +47,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index 5266853..2eb8ab2 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.16 1997/02/22 09:40:38 peter Exp $
+ * $Id: umap_vnops.c,v 1.17 1997/05/25 04:50:01 peter Exp $
*/
/*
@@ -45,8 +45,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index b05197c..493a172 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,19 +35,16 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.17 1997/04/13 06:27:09 phk Exp $
+ * $Id: union_subr.c,v 1.18 1997/04/16 16:24:24 kato Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/fcntl.h>
#include <sys/filedesc.h>
-#include <sys/queue.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <vm/vm.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 33f2525..82edf91 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.16 1997/04/19 06:04:13 kato Exp $
+ * $Id: union_vfsops.c,v 1.17 1997/05/07 14:37:31 kato Exp $
*/
/*
@@ -45,15 +45,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/time.h>
-#include <sys/types.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/filedesc.h>
-#include <sys/queue.h>
#include <miscfs/union/union.h>
extern int union_init __P((struct vfsconf *));
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 7630d14..63f78f8 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -37,12 +37,10 @@
*
* @(#)bpf_filter.c 8.1 (Berkeley) 6/10/93
*
- * $Id$
+ * $Id: bpf_filter.c,v 1.8 1997/02/22 09:40:57 peter Exp $
*/
#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
#ifdef sun
#include <netinet/in.h>
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index ee2b1c1..cc0222b 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -39,19 +39,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
-#if defined(__FreeBSD__)
-#include <sys/sockio.h>
-#else
-#include <sys/ioctl.h>
-#endif
-#include <sys/errno.h>
-#include <sys/syslog.h>
-
-#include <machine/cpu.h>
#include <net/if.h>
#include <net/netisr.h>
@@ -80,7 +69,6 @@
* header to the mbuf.
* --kjc
*/
-#include <sys/time.h>
#include <net/bpf.h>
#endif /* NBPFILTER > 0 */
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index ebeed07..574bc08 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93
- * $Id: if_disc.c,v 1.16 1997/02/22 09:40:59 peter Exp $
+ * $Id: if_disc.c,v 1.17 1997/03/24 11:33:10 bde Exp $
*/
/*
@@ -44,33 +44,13 @@
#include <sys/kernel.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <sys/errno.h>
#include <sys/sockio.h>
-#include <sys/time.h>
#include <net/if.h>
#include <net/if_types.h>
-#include <net/netisr.h>
#include <net/route.h>
#include <net/bpf.h>
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#endif
-
#include "bpfilter.h"
#ifdef TINY_DSMTU
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 3a22669..26fb540 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -33,20 +33,14 @@
* SUCH DAMAGE.
*
* from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $Id: if_fddisubr.c,v 1.18 1997/03/24 11:24:46 bde Exp $
+ * $Id: if_fddisubr.c,v 1.19 1997/05/10 10:01:32 jhay Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-
-#include <machine/cpu.h>
#include <net/if.h>
#include <net/netisr.h>
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 50c208b..8aafc51 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_loop.c 8.1 (Berkeley) 6/10/93
- * $Id: if_loop.c,v 1.25 1997/02/22 09:41:02 peter Exp $
+ * $Id: if_loop.c,v 1.26 1997/03/24 11:33:12 bde Exp $
*/
/*
@@ -45,9 +45,7 @@
#include <sys/kernel.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <sys/errno.h>
#include <sys/sockio.h>
-#include <sys/time.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -57,9 +55,7 @@
#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
#include <netinet/in_var.h>
-#include <netinet/ip.h>
#endif
#ifdef IPX
@@ -78,7 +74,6 @@
#endif
#ifdef NETATALK
-#include <netinet/if_ether.h>
#include <netatalk/at.h>
#include <netatalk/at_var.h>
#endif NETATALK
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 297176d..b867188 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,5 +1,5 @@
/* $NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $ */
-/* $Id$ */
+/* $Id: if_media.c,v 1.2 1997/05/03 20:58:10 peter Exp $ */
/*
* Copyright (c) 1997
@@ -48,14 +48,12 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/errno.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/malloc.h>
#include <net/if.h>
#include <net/if_media.h>
-#include <net/netisr.h>
/*
* Compile-time options:
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index 076aedc..268669d 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -26,21 +26,17 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: if_mib.c,v 1.4 1997/02/22 09:41:02 peter Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/errno.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
#include <net/if.h>
-#include <net/if_dl.h>
#include <net/if_mib.h>
-#include <net/if_types.h>
/*
* A sysctl(3) MIB for generic interface information. This information
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index c3430d1..44e3f5e 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_sl.c 8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.56 1997/07/27 19:28:26 ache Exp $
+ * $Id: if_sl.c,v 1.57 1997/07/28 14:57:10 ache Exp $
*/
/*
@@ -75,7 +75,6 @@
#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/buf.h>
#include <sys/dkstat.h>
#include <sys/socket.h>
#include <sys/sockio.h>
@@ -89,7 +88,6 @@
#include <net/if.h>
#include <net/if_types.h>
#include <net/netisr.h>
-#include <net/route.h>
#if INET
#include <netinet/in.h>
@@ -105,7 +103,6 @@ Huh? Slip without inet?
#include <net/slip.h>
#if NBPFILTER > 0
-#include <sys/time.h>
#include <net/bpf.h>
#endif
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 9ec02fb..ec847ed 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,23 +31,17 @@
* SUCH DAMAGE.
*
* @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93
- * $Id: raw_usrreq.c,v 1.11 1997/04/14 18:23:25 phk Exp $
+ * $Id: raw_usrreq.c,v 1.12 1997/04/27 20:00:59 wollman Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
#include <sys/proc.h>
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/errno.h>
-#include <net/if.h>
-#include <net/route.h>
-#include <net/netisr.h>
#include <net/raw_cb.h>
/*
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 371e12a..110bda7 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -3,8 +3,6 @@
* All Rights Reserved. See COPYRIGHT.
*/
-#include <sys/errno.h>
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
@@ -14,14 +12,10 @@
#include <sys/protosw.h>
#include <net/if.h>
#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
#include <netatalk/at.h>
#include <netatalk/at_var.h>
#include <netatalk/ddp_var.h>
-#include <netatalk/aarp.h>
-#include <netatalk/endian.h>
#include <netatalk/at_extern.h>
static void at_pcbdisconnect( struct ddpcb *ddp );
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 371e12a..110bda7 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -3,8 +3,6 @@
* All Rights Reserved. See COPYRIGHT.
*/
-#include <sys/errno.h>
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
@@ -14,14 +12,10 @@
#include <sys/protosw.h>
#include <net/if.h>
#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
#include <netatalk/at.h>
#include <netatalk/at_var.h>
#include <netatalk/ddp_var.h>
-#include <netatalk/aarp.h>
-#include <netatalk/endian.h>
#include <netatalk/at_extern.h>
static void at_pcbdisconnect( struct ddpcb *ddp );
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index a1daf11..81a955b 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -40,19 +40,10 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#if defined(__FreeBSD__)
#include <sys/sockio.h>
-#else
-#include <sys/ioctl.h>
-#endif
#include <sys/syslog.h>
-#include <sys/proc.h>
#include <net/if.h>
#include <net/if_dl.h>
@@ -60,9 +51,6 @@
#include <net/if_atm.h>
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
#include <netinet/if_atm.h>
#ifdef NATM
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 4586c22..8ec66ff 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,28 +31,23 @@
* SUCH DAMAGE.
*
* @(#)in.c 8.4 (Berkeley) 1/9/95
- * $Id: in.c,v 1.33 1997/03/24 11:33:25 bde Exp $
+ * $Id: in.c,v 1.34 1997/04/27 20:01:03 wollman Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/sockio.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/socket.h>
-#include <sys/socketvar.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <net/if.h>
#include <net/route.h>
-#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
-#include <netinet/if_ether.h>
#include <netinet/igmp_var.h>
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 5c1c24d..2d9c9da 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: in_rmx.c,v 1.28 1997/02/13 19:46:41 wollman Exp $
+ * $Id: in_rmx.c,v 1.29 1997/02/14 18:15:45 wollman Exp $
*/
/*
@@ -46,26 +46,15 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/queue.h>
#include <sys/socket.h>
-#include <sys/socketvar.h>
#include <sys/mbuf.h>
#include <sys/syslog.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
-#include <netinet/in_systm.h>
#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-#include <netinet/tcp.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-
extern int in_inithead __P((void **head, int off));
#define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 0c941a3..5106a59 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,17 +30,15 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ip_divert.c,v 1.11 1997/06/01 15:58:44 peter Exp $
+ * $Id: ip_divert.c,v 1.12 1997/06/02 05:02:35 julian Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/protosw.h>
#include <sys/socketvar.h>
-#include <sys/errno.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index de4fbad..9d047a6 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
*
* This software is provided ``AS IS'' without any warranties of any kind.
*
- * $Id: ip_fw.c,v 1.58 1997/06/02 05:02:36 julian Exp $
+ * $Id: ip_fw.c,v 1.59 1997/06/04 22:09:15 julian Exp $
*/
/*
@@ -27,13 +27,10 @@
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/queue.h>
#include <sys/kernel.h>
#include <sys/socket.h>
-#include <sys/time.h>
#include <sys/sysctl.h>
#include <net/if.h>
-#include <net/route.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index d813c29..3166dd8 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,18 +31,16 @@
* SUCH DAMAGE.
*
* @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94
- * $Id: ip_icmp.c,v 1.25 1997/02/22 09:41:33 peter Exp $
+ * $Id: ip_icmp.c,v 1.26 1997/05/23 22:33:16 julian Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/kernel.h>
-#include <sys/socket.h>
#include <sys/sysctl.h>
#include <net/if.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 4401f6b..01d9ad3 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,17 +31,15 @@
* SUCH DAMAGE.
*
* @(#)ip_output.c 8.3 (Berkeley) 1/21/94
- * $Id: ip_output.c,v 1.56 1997/05/06 21:22:04 fenner Exp $
+ * $Id: ip_output.c,v 1.57 1997/06/02 05:02:37 julian Exp $
*/
#define _IP_VHL
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/errno.h>
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 51594c7..b5b3c7d 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -31,18 +31,16 @@
* SUCH DAMAGE.
*
* @(#)raw_ip.c 8.7 (Berkeley) 5/15/95
- * $Id: raw_ip.c,v 1.45 1997/04/27 20:01:10 wollman Exp $
+ * $Id: raw_ip.c,v 1.46 1997/05/22 20:52:56 fenner Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/proc.h>
#include <sys/protosw.h>
-#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/sysctl.h>
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index 9dff2efd..b90ff6e 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_debug.c 8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: tcp_debug.c,v 1.9 1997/02/22 09:41:37 peter Exp $
*/
#ifdef TCPDEBUG
@@ -43,25 +43,14 @@
#endif
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
#include <sys/protosw.h>
-#include <sys/errno.h>
-
-#include <net/route.h>
-#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
#include <netinet/ip_var.h>
#include <netinet/tcp.h>
#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
#include <netinet/tcpip.h>
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 8d43589..bcaca20 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,18 +31,15 @@
* SUCH DAMAGE.
*
* @(#)tcp_output.c 8.4 (Berkeley) 5/24/95
- * $Id: tcp_output.c,v 1.23 1997/02/22 09:41:40 peter Exp $
+ * $Id: tcp_output.c,v 1.24 1997/04/03 05:14:43 davidg Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/errno.h>
#include <net/route.h>
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 6843217..63357dd 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,30 +31,24 @@
* SUCH DAMAGE.
*
* @(#)tcp_timer.c 8.2 (Berkeley) 5/24/95
- * $Id$
+ * $Id: tcp_timer.c,v 1.22 1997/02/22 09:41:42 peter Exp $
*/
#ifndef TUBA_INCLUDE
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/protosw.h>
-#include <sys/errno.h>
#include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */
-#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/in_pcb.h>
#include <netinet/ip_var.h>
#include <netinet/tcp.h>
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 6946c08..36256fd 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,28 +31,23 @@
* SUCH DAMAGE.
*
* From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94
- * $Id: tcp_usrreq.c,v 1.30 1997/02/21 16:30:31 wollman Exp $
+ * $Id: tcp_usrreq.c,v 1.31 1997/04/27 20:01:14 wollman Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/protosw.h>
-#include <sys/errno.h>
-#include <sys/stat.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
-#include <netinet/ip.h>
#include <netinet/in_pcb.h>
#include <netinet/in_var.h>
#include <netinet/ip_var.h>
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index 198a091..6184f87 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -39,16 +39,10 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/queue.h>
#include <sys/socket.h>
-#include <sys/protosw.h>
-#include <sys/domain.h>
-#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <net/if.h>
-#include <net/radix.h>
-#include <net/route.h>
#include <netinet/in.h>
diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c
index c0e0499..9f8fc52 100644
--- a/sys/netnatm/natm_proto.c
+++ b/sys/netnatm/natm_proto.c
@@ -39,15 +39,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/protosw.h>
#include <sys/domain.h>
-#include <sys/mbuf.h>
#include <net/if.h>
-#include <net/radix.h>
-#include <net/route.h>
#include <netinet/in.h>
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 8e1de5d..12e2081 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.41 1997/06/16 00:23:40 dyson Exp $
+ * $Id: nfs_bio.c,v 1.42 1997/06/25 08:35:41 dfr Exp $
*/
@@ -47,10 +47,8 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/kernel.h>
-#include <sys/sysctl.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
#include <vm/vm_prot.h>
#include <vm/vm_page.h>
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 79c0139..66796aa 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.16 1997/02/22 09:42:36 peter Exp $
+ * $Id: nfs_node.c,v 1.17 1997/05/09 13:04:43 dfr Exp $
*/
@@ -44,15 +44,12 @@
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/vnode.h>
-#include <sys/kernel.h>
#include <sys/malloc.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
-#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>
-#include <nfs/nqnfs.h>
LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl;
u_long nfsnodehash;
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 6121db0..c2623a3 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_srvcache.c 8.3 (Berkeley) 3/30/95
- * $Id: nfs_srvcache.c,v 1.11 1997/02/22 09:42:40 peter Exp $
+ * $Id: nfs_srvcache.c,v 1.12 1997/05/10 16:12:03 dfr Exp $
*/
#ifndef NFS_NOSERVER
@@ -44,26 +44,20 @@
* pages 53-63. San Diego, February 1989.
*/
#include <sys/param.h>
-#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/socket.h>
-#include <sys/socketvar.h>
#include <netinet/in.h>
#ifdef ISO
#include <netiso/iso.h>
#endif
-#include <nfs/nfsm_subs.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#include <nfs/nfsrvcache.h>
-#include <nfs/nqnfs.h>
extern struct nfsstats nfsstats;
extern int nfsv2_procid[NFS_NPROCS];
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 8e1de5d..12e2081 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.41 1997/06/16 00:23:40 dyson Exp $
+ * $Id: nfs_bio.c,v 1.42 1997/06/25 08:35:41 dfr Exp $
*/
@@ -47,10 +47,8 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/kernel.h>
-#include <sys/sysctl.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
#include <vm/vm_prot.h>
#include <vm/vm_page.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 79c0139..66796aa 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.16 1997/02/22 09:42:36 peter Exp $
+ * $Id: nfs_node.c,v 1.17 1997/05/09 13:04:43 dfr Exp $
*/
@@ -44,15 +44,12 @@
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/vnode.h>
-#include <sys/kernel.h>
#include <sys/malloc.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
-#include <nfs/nfs.h>
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>
-#include <nfs/nqnfs.h>
LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl;
u_long nfsnodehash;
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index 6121db0..c2623a3 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_srvcache.c 8.3 (Berkeley) 3/30/95
- * $Id: nfs_srvcache.c,v 1.11 1997/02/22 09:42:40 peter Exp $
+ * $Id: nfs_srvcache.c,v 1.12 1997/05/10 16:12:03 dfr Exp $
*/
#ifndef NFS_NOSERVER
@@ -44,26 +44,20 @@
* pages 53-63. San Diego, February 1989.
*/
#include <sys/param.h>
-#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/socket.h>
-#include <sys/socketvar.h>
#include <netinet/in.h>
#ifdef ISO
#include <netiso/iso.h>
#endif
-#include <nfs/nfsm_subs.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
#include <nfs/nfs.h>
#include <nfs/nfsrvcache.h>
-#include <nfs/nqnfs.h>
extern struct nfsstats nfsstats;
extern int nfsv2_procid[NFS_NPROCS];
diff --git a/sys/pci/bt9xx.c b/sys/pci/bt9xx.c
index 6c9bfda..e50116e 100644
--- a/sys/pci/bt9xx.c
+++ b/sys/pci/bt9xx.c
@@ -19,16 +19,14 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id$
+ * $Id: bt9xx.c,v 1.10 1997/02/22 09:44:00 peter Exp $
*/
#include "pci.h"
#if NPCI > 0
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index e8e13c7..21de978 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* From: wd82371.c,v 1.5.2.1 1996/11/16 21:19:51 phk Exp $
- * $Id$
+ * $Id: ide_pci.c,v 1.1 1997/07/29 12:57:09 sos Exp $
*/
#include "pci.h"
@@ -35,16 +35,12 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/queue.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h> /* for vtophys */
-
#include <i386/isa/wdreg.h>
#include <pci/pcivar.h>
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index 6bd8037..0dab356 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,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: if_fpa.c,v 1.2 1997/01/17 23:54:42 joerg Exp $
+ * $Id: if_fpa.c,v 1.3 1997/03/24 11:24:51 bde Exp $
*
*/
@@ -34,44 +34,21 @@
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
#if defined(__bsdi__) || defined(__NetBSD__)
#include <sys/device.h>
#endif
#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include "bpfilter.h"
-#if NBPFILTER > 0
-#include <net/bpf.h>
-#include <net/bpfdesc.h>
-#endif
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
#endif
-#if defined(__FreeBSD__)
-#include <netinet/if_fddi.h>
-#else
-#include <net/if_fddi.h>
-#endif
-
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_param.h>
#if defined(__FreeBSD__)
#include "fpa.h"
#include <pci/pcivar.h>
-#include <i386/isa/icu.h>
#include <dev/pdq/pdqvar.h>
#include <dev/pdq/pdqreg.h>
#elif defined(__bsdi__)
@@ -83,9 +60,6 @@
#if _BSDI_VERSION < 199401
#define IRQSHARE 0
#endif
-#include <i386/pci/pci.h>
-#include <dev/pdq/pdqvar.h>
-#include <dev/pdq/pdqreg.h>
#elif defined(__NetBSD__)
#include <dev/pci/pcivar.h>
#include <dev/ic/pdqvar.h>
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 7873f3f..669bb1f 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_fxp.c,v 1.36 1997/06/16 04:45:57 davidg Exp $
+ * $Id: if_fxp.c,v 1.37 1997/07/25 23:41:12 davidg Exp $
*/
/*
@@ -43,22 +43,12 @@
#include <sys/syslog.h>
#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
#include <netinet/if_ether.h>
#endif
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
#ifdef NS
#include <netns/ns.h>
#include <netns/ns_if.h>
@@ -66,11 +56,9 @@
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
#include <vm/vm.h> /* for vtophys */
-#include <vm/vm_param.h> /* for vtophys */
#include <vm/pmap.h> /* for vtophys */
#include <machine/clock.h> /* for DELAY */
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index acd68a1..f1ec939 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.c
@@ -17,7 +17,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: if_lnc_p.c,v 1.3 1997/02/22 09:44:06 peter Exp $
+ * $Id: if_lnc_p.c,v 1.4 1997/04/04 16:44:52 kato Exp $
*/
#include "pci.h"
@@ -29,7 +29,6 @@
#include <sys/kernel.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
-#include <i386/isa/isa_device.h>
#include "lnc.h"
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 0891a05..09f3b6f 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: ncr.c,v 1.101 1997/07/28 21:32:05 se Exp $
+** $Id: ncr.c,v 1.102 1997/07/29 21:50:04 se Exp $
**
** Device driver for the NCR 53C810 PCI-SCSI-Controller.
**
@@ -199,10 +199,8 @@
#endif
#include <stddef.h>
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
-#include <sys/proc.h>
#ifdef KERNEL
#include <sys/systm.h>
@@ -217,7 +215,6 @@
#include <machine/clock.h>
#endif
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
#endif /* KERNEL */
@@ -235,7 +232,6 @@
#define DELAY(x) delay(x)
#endif /* __NetBSD */
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
@@ -1350,7 +1346,7 @@ static void ncr_attach (pcici_t tag, int unit);
static char ident[] =
- "\n$Id: ncr.c,v 1.101 1997/07/28 21:32:05 se Exp $\n";
+ "\n$Id: ncr.c,v 1.102 1997/07/29 21:50:04 se Exp $\n";
static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct ncb) * 7
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index e197ee6..bb5a0f8 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,18 +23,14 @@
* (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: pci.c,v 1.2 1997/06/25 20:16:02 smp Exp smp $
+ * $Id: pci.c,v 1.77 1997/06/25 20:56:29 fsmp Exp $
*
*/
#include "pci.h"
#if NPCI > 0
-#include <stddef.h>
-
-#include <sys/types.h>
#include <sys/param.h>
-#include <sys/time.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/fcntl.h>
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index 1a97ed2..dc726f5 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -23,7 +23,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: pci_compat.c,v 1.2 1997/05/28 10:10:02 se Exp $
+ * $Id: pci_compat.c,v 1.3 1997/05/30 20:58:04 se Exp $
*
*/
@@ -32,18 +32,13 @@
/* for compatibility to FreeBSD-2.2 version of PCI code */
-#include <stddef.h>
-
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <sys/fcntl.h>
#include <sys/kernel.h> /* for DATA_SET support */
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <i386/isa/isa_device.h>
#include <sys/interrupt.h>
#include <pci/pcireg.h>
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index ac78356..c33ba34 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcisupport.c,v 1.48 1997/07/18 19:47:23 se Exp $
+** $Id: pcisupport.c,v 1.49 1997/07/29 12:57:08 sos Exp $
**
** Device driver for DEC/INTEL PCI chipsets.
**
@@ -41,7 +41,6 @@
***************************************************************************
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/pci/wd82371.c b/sys/pci/wd82371.c
index be212cc..2127446 100644
--- a/sys/pci/wd82371.c
+++ b/sys/pci/wd82371.c
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: wd82371.c,v 1.8 1997/02/22 09:44:14 peter Exp $
*/
#include "pci.h"
@@ -34,20 +34,15 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/queue.h>
-#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h> /* for vtophys */
-
#include <i386/isa/wdreg.h>
#include <pci/pcivar.h>
-#include <pci/pcireg.h>
#include <pci/wd82371reg.h>
static void *piix_candma(int, int);
diff --git a/sys/pci/wdc_p.c b/sys/pci/wdc_p.c
index db9fffa..67d9de6 100644
--- a/sys/pci/wdc_p.c
+++ b/sys/pci/wdc_p.c
@@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: wdc_p.c,v 1.1 1997/03/11 23:17:26 se Exp $
+ * $Id: wdc_p.c,v 1.2 1997/04/28 19:26:18 se Exp $
*/
/*
@@ -30,15 +30,11 @@
#ifdef CMD640
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <pci/pcireg.h>
#include <pci/pcivar.h>
#include <i386/isa/wdc_p.h>
-#include "wdc.h"
-
/*
* PCI-ID's of IDE-Controller
*/
diff --git a/sys/scsi/ssc.c b/sys/scsi/ssc.c
index 26bc9c7..5002d02 100644
--- a/sys/scsi/ssc.c
+++ b/sys/scsi/ssc.c
@@ -49,18 +49,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*End copyright
- * $Id$
+ * $Id: ssc.c,v 1.14 1997/02/22 09:44:38 peter Exp $
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/scsiio.h>
#include <sys/kernel.h>
-#include <sys/errno.h>
#include <sys/stat.h>
-#include <sys/buf.h>
-#include <sys/systm.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#endif /*DEVFS*/
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index 80daa12..3439218 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -2,7 +2,7 @@
* Driver for a device we can't identify.
* by Julian Elischer (julian@tfs.com)
*
- * $Id: uk.c,v 1.16 1997/02/22 09:44:41 peter Exp $
+ * $Id: uk.c,v 1.17 1997/03/23 06:33:54 bde Exp $
*
* If you find that you are adding any code to this file look closely
* at putting it in "scsi_driver.c" instead.
@@ -15,7 +15,6 @@
#ifdef DEVFS
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_driver.h>
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 33a65de..3ad0bda 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,18 +31,14 @@
* SUCH DAMAGE.
*
* @(#)ffs_balloc.c 8.8 (Berkeley) 6/16/95
- * $Id: ffs_balloc.c,v 1.13 1997/02/22 09:47:01 peter Exp $
+ * $Id: ffs_balloc.c,v 1.14 1997/04/10 13:17:09 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/file.h>
#include <sys/vnode.h>
-#include <vm/vm.h>
-
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
#include <ufs/ufs/ufs_extern.h>
diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c
index 6cde979..7d1e80c 100644
--- a/sys/ufs/lfs/lfs_alloc.c
+++ b/sys/ufs/lfs/lfs_alloc.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)lfs_alloc.c 8.7 (Berkeley) 5/14/95
- * $Id: lfs_alloc.c,v 1.13 1997/02/22 09:47:16 peter Exp $
+ * $Id: lfs_alloc.c,v 1.14 1997/03/23 00:45:07 bde Exp $
*/
#include "opt_quota.h"
@@ -41,12 +41,10 @@
#include <sys/kernel.h>
#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/syslog.h>
#include <sys/mount.h>
#include <sys/malloc.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
#include <ufs/ufs/quota.h>
diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c
index 44f0cb4..dfa3dcf 100644
--- a/sys/ufs/lfs/lfs_balloc.c
+++ b/sys/ufs/lfs/lfs_balloc.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)lfs_balloc.c 8.4 (Berkeley) 5/8/95
- * $Id: lfs_balloc.c,v 1.11 1997/03/23 00:45:10 bde Exp $
+ * $Id: lfs_balloc.c,v 1.12 1997/05/25 04:57:11 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,14 +39,10 @@
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/resourcevar.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
-#include <miscfs/specfs/specdev.h>
-
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
#include <ufs/ufs/ufsmount.h>
diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c
index 57663ef..ad7b391 100644
--- a/sys/ufs/lfs/lfs_bio.c
+++ b/sys/ufs/lfs/lfs_bio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)lfs_bio.c 8.10 (Berkeley) 6/10/95
- * $Id: lfs_bio.c,v 1.12 1997/03/23 00:45:13 bde Exp $
+ * $Id: lfs_bio.c,v 1.13 1997/06/15 17:56:46 dyson Exp $
*/
#include <sys/param.h>
@@ -39,7 +39,6 @@
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/resourcevar.h>
#include <sys/mount.h>
#include <sys/kernel.h>
diff --git a/sys/ufs/lfs/lfs_debug.c b/sys/ufs/lfs/lfs_debug.c
index 3c67e1f..7dc47a2 100644
--- a/sys/ufs/lfs/lfs_debug.c
+++ b/sys/ufs/lfs/lfs_debug.c
@@ -31,20 +31,17 @@
* SUCH DAMAGE.
*
* @(#)lfs_debug.c 8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: lfs_debug.c,v 1.6 1997/02/22 09:47:19 peter Exp $
*/
#ifdef DEBUG
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
-#include <sys/vnode.h>
#include <sys/mount.h>
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
#include <ufs/lfs/lfs.h>
-#include <ufs/lfs/lfs_extern.h>
static void lfs_dump_dinode __P((struct dinode *dip));
static void lfs_dump_super __P((struct lfs *lfsp));
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 4798303..d09a185 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -31,29 +31,20 @@
* SUCH DAMAGE.
*
* @(#)lfs_segment.c 8.10 (Berkeley) 6/10/95
- * $Id: lfs_segment.c,v 1.21 1997/03/23 00:45:17 bde Exp $
+ * $Id: lfs_segment.c,v 1.22 1997/06/15 17:56:46 dyson Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
#include <sys/kernel.h>
-#include <sys/resourcevar.h>
-#include <sys/file.h>
-#include <sys/stat.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/conf.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
#include <sys/mount.h>
-#include <miscfs/specfs/specdev.h>
-#include <miscfs/fifofs/fifo.h>
-
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
-#include <ufs/ufs/dir.h>
#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/ufs_extern.h>
diff --git a/sys/ufs/lfs/lfs_subr.c b/sys/ufs/lfs/lfs_subr.c
index 6c19dd2..62ab3ea 100644
--- a/sys/ufs/lfs/lfs_subr.c
+++ b/sys/ufs/lfs/lfs_subr.c
@@ -31,12 +31,11 @@
* SUCH DAMAGE.
*
* @(#)lfs_subr.c 8.4 (Berkeley) 5/8/95
- * $Id$
+ * $Id: lfs_subr.c,v 1.10 1997/02/22 09:47:23 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/buf.h>
#include <sys/mount.h>
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 25d8b2c..b1c1c0e 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)lfs_vfsops.c 8.20 (Berkeley) 6/10/95
- * $Id: lfs_vfsops.c,v 1.18 1997/03/23 03:37:42 bde Exp $
+ * $Id: lfs_vfsops.c,v 1.19 1997/03/24 11:25:08 bde Exp $
*/
#include "opt_quota.h"
@@ -44,12 +44,9 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/buf.h>
-#include <sys/mbuf.h>
#include <sys/fcntl.h>
#include <sys/disklabel.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
-#include <sys/socket.h>
#include <miscfs/specfs/specdev.h>
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index 367cdb1..335c4e3 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,12 +31,11 @@
* SUCH DAMAGE.
*
* @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95
- * $Id$
+ * $Id: mfs_vnops.c,v 1.17 1997/02/22 09:47:33 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/buf.h>
@@ -45,10 +44,7 @@
#include <miscfs/specfs/specdev.h>
-#include <machine/vmparam.h>
-
#include <ufs/mfs/mfsnode.h>
-#include <ufs/mfs/mfsiom.h>
#include <ufs/mfs/mfs_extern.h>
static int mfs_badop __P((void));
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index ce9ef41..403e4d9 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,11 +34,9 @@
* SUCH DAMAGE.
*
* @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95
- * $Id: ufs_quota.c,v 1.12 1997/03/09 06:10:34 mpp Exp $
+ * $Id: ufs_quota.c,v 1.13 1997/03/23 03:37:48 bde Exp $
*/
-#include "opt_quota.h" /* not really necessary... */
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
@@ -52,7 +50,6 @@
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
/*
* Quota name to error message mapping.
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 87e224b..ba994b8 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -36,20 +36,15 @@
* SUCH DAMAGE.
*
* @(#)ufs_vfsops.c 8.8 (Berkeley) 5/20/95
- * $Id$
+ * $Id: ufs_vfsops.c,v 1.8 1997/02/22 09:47:52 peter Exp $
*/
#include "opt_quota.h"
#include <sys/param.h>
-#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/proc.h>
-#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/malloc.h>
-
-#include <miscfs/specfs/specdev.h>
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index bc0c132..b3fc583 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id$
+ * $Id: vm_init.c,v 1.15 1997/02/22 09:48:20 peter Exp $
*/
/*
@@ -71,16 +71,13 @@
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/queue.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_prot.h>
#include <sys/lock.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
-#include <vm/vm_kern.h>
#include <vm/vm_pager.h>
#include <vm/vm_extern.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 2fa675d..ea1165b 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_kern.c,v 1.36 1997/05/29 02:57:22 peter Exp $
+ * $Id: vm_kern.c,v 1.37 1997/06/22 15:47:11 peter Exp $
*/
/*
@@ -70,12 +70,9 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
-#include <sys/queue.h>
-#include <sys/vmmeter.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
@@ -86,7 +83,6 @@
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pageout.h>
-#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
vm_map_t kernel_map=0;
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index e9fbff5..5dbfd5f 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -38,14 +38,13 @@
* from: Utah $Hdr: vm_unix.c 1.1 89/11/07$
*
* @(#)vm_unix.c 8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: vm_unix.c,v 1.14 1997/02/22 09:48:40 peter Exp $
*/
/*
* Traditional sbrk/grow interface to VM
*/
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/sysproto.h>
#include <sys/proc.h>
#include <sys/resourcevar.h>
OpenPOWER on IntegriCloud