summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/machdep.c4
-rw-r--r--sys/amd64/amd64/support.S3
-rw-r--r--sys/amd64/amd64/support.s3
-rw-r--r--sys/amd64/amd64/vm_machdep.c3
-rw-r--r--sys/dev/bktr/bktr_core.c7
-rw-r--r--sys/dev/cy/cy_pci.c3
-rw-r--r--sys/dev/de/if_de.c17
-rw-r--r--sys/dev/sr/if_sr_pci.c3
-rw-r--r--sys/fs/deadfs/dead_vnops.c6
-rw-r--r--sys/fs/fdescfs/fdesc_vnops.c5
-rw-r--r--sys/fs/fifofs/fifo_vnops.c7
-rw-r--r--sys/fs/msdosfs/msdosfs_denode.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_fat.c5
-rw-r--r--sys/fs/msdosfs/msdosfs_lookup.c3
-rw-r--r--sys/fs/specfs/spec_vnops.c5
-rw-r--r--sys/fs/unionfs/union_vnops.c5
-rw-r--r--sys/gnu/ext2fs/ext2_bmap.c4
-rw-r--r--sys/gnu/fs/ext2fs/ext2_bmap.c4
-rw-r--r--sys/i386/i386/in_cksum.c3
-rw-r--r--sys/i386/i386/machdep.c4
-rw-r--r--sys/i386/i386/microtime.s3
-rw-r--r--sys/i386/i386/support.s3
-rw-r--r--sys/i386/i386/vm_machdep.c3
-rw-r--r--sys/kern/imgact_aout.c5
-rw-r--r--sys/kern/imgact_gzip.c4
-rw-r--r--sys/kern/init_main.c6
-rw-r--r--sys/kern/kern_acct.c3
-rw-r--r--sys/kern/kern_clock.c4
-rw-r--r--sys/kern/kern_exec.c5
-rw-r--r--sys/kern/kern_exit.c11
-rw-r--r--sys/kern/kern_malloc.c3
-rw-r--r--sys/kern/kern_physio.c3
-rw-r--r--sys/kern/kern_shutdown.c7
-rw-r--r--sys/kern/kern_sig.c7
-rw-r--r--sys/kern/kern_subr.c3
-rw-r--r--sys/kern/kern_synch.c6
-rw-r--r--sys/kern/kern_tc.c4
-rw-r--r--sys/kern/kern_threads.c14
-rw-r--r--sys/kern/kern_time.c4
-rw-r--r--sys/kern/kern_timeout.c4
-rw-r--r--sys/kern/subr_diskslice.c3
-rw-r--r--sys/kern/subr_prf.c4
-rw-r--r--sys/kern/subr_rlist.c5
-rw-r--r--sys/kern/sys_generic.c6
-rw-r--r--sys/kern/sys_pipe.c10
-rw-r--r--sys/kern/sys_process.c8
-rw-r--r--sys/kern/tty.c6
-rw-r--r--sys/kern/tty_pty.c3
-rw-r--r--sys/kern/tty_tty.c3
-rw-r--r--sys/kern/uipc_sockbuf.c4
-rw-r--r--sys/kern/uipc_socket.c3
-rw-r--r--sys/kern/uipc_socket2.c4
-rw-r--r--sys/kern/uipc_syscalls.c5
-rw-r--r--sys/kern/uipc_usrreq.c4
-rw-r--r--sys/kern/vfs_aio.c10
-rw-r--r--sys/kern/vfs_cache.c4
-rw-r--r--sys/kern/vfs_export.c10
-rw-r--r--sys/kern/vfs_extattr.c4
-rw-r--r--sys/kern/vfs_lookup.c5
-rw-r--r--sys/kern/vfs_subr.c10
-rw-r--r--sys/kern/vfs_syscalls.c4
-rw-r--r--sys/kern/vfs_vnops.c9
-rw-r--r--sys/miscfs/deadfs/dead_vnops.c6
-rw-r--r--sys/miscfs/fdesc/fdesc_vnops.c5
-rw-r--r--sys/miscfs/fifofs/fifo_vnops.c7
-rw-r--r--sys/miscfs/kernfs/kernfs_vnops.c6
-rw-r--r--sys/miscfs/specfs/spec_vnops.c5
-rw-r--r--sys/miscfs/union/union_vnops.c5
-rw-r--r--sys/msdosfs/msdosfs_denode.c4
-rw-r--r--sys/msdosfs/msdosfs_fat.c5
-rw-r--r--sys/msdosfs/msdosfs_lookup.c3
-rw-r--r--sys/pci/brooktree848.c7
-rw-r--r--sys/pci/cy_pci.c3
-rw-r--r--sys/pci/if_de.c17
-rw-r--r--sys/pci/if_sr_p.c3
-rw-r--r--sys/pci/meteor.c8
-rw-r--r--sys/scsi/cd.c7
-rw-r--r--sys/scsi/ch.c9
-rw-r--r--sys/scsi/od.c12
-rw-r--r--sys/scsi/pt.c4
-rw-r--r--sys/scsi/scsi_base.c8
-rw-r--r--sys/scsi/scsi_driver.c7
-rw-r--r--sys/scsi/scsi_ioctl.c6
-rw-r--r--sys/scsi/scsiconf.c8
-rw-r--r--sys/scsi/sctarg.c4
-rw-r--r--sys/scsi/sd.c6
-rw-r--r--sys/scsi/st.c7
-rw-r--r--sys/scsi/su.c8
-rw-r--r--sys/scsi/worm.c4
-rw-r--r--sys/ufs/ffs/ffs_alloc.c5
-rw-r--r--sys/ufs/ffs/ffs_inode.c6
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c7
-rw-r--r--sys/ufs/ffs/ffs_vnops.c7
-rw-r--r--sys/ufs/lfs/lfs_inode.c6
-rw-r--r--sys/ufs/lfs/lfs_vnops.c9
-rw-r--r--sys/ufs/mfs/mfs_vfsops.c8
-rw-r--r--sys/ufs/ufs/ufs_bmap.c4
-rw-r--r--sys/ufs/ufs/ufs_inode.c7
-rw-r--r--sys/ufs/ufs/ufs_lookup.c3
-rw-r--r--sys/ufs/ufs/ufs_vnops.c7
100 files changed, 97 insertions, 470 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 1c4489c..ef25175 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.259 1997/08/31 23:08:27 bde Exp $
+ * $Id: machdep.c,v 1.260 1997/09/01 01:54:50 bde Exp $
*/
#include "apm.h"
@@ -100,13 +100,11 @@
#endif
#include <machine/cpu.h>
#include <machine/reg.h>
-#include <machine/psl.h>
#include <machine/clock.h>
#include <machine/specialreg.h>
#include <machine/cons.h>
#include <machine/bootinfo.h>
#include <machine/md_var.h>
-#include <machine/pcb_ext.h>
#ifdef SMP
#include <machine/smp.h>
#endif
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 811e068..2ae3e20 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -30,11 +30,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: support.s,v 1.55 1997/07/17 04:33:40 dyson Exp $
+ * $Id: support.s,v 1.56 1997/08/09 00:02:44 dyson Exp $
*/
#include "npx.h"
-#include "opt_cpu.h"
#include <machine/asmacros.h>
#include <machine/cputypes.h>
diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s
index 811e068..2ae3e20 100644
--- a/sys/amd64/amd64/support.s
+++ b/sys/amd64/amd64/support.s
@@ -30,11 +30,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: support.s,v 1.55 1997/07/17 04:33:40 dyson Exp $
+ * $Id: support.s,v 1.56 1997/08/09 00:02:44 dyson Exp $
*/
#include "npx.h"
-#include "opt_cpu.h"
#include <machine/asmacros.h>
#include <machine/cputypes.h>
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 0d2c672..7c93b00 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,7 +38,7 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $Id: vm_machdep.c,v 1.85 1997/08/09 00:02:56 dyson Exp $
+ * $Id: vm_machdep.c,v 1.86 1997/08/26 18:10:34 peter Exp $
*/
#include "npx.h"
@@ -55,7 +55,6 @@
#include <machine/clock.h>
#include <machine/cpu.h>
#include <machine/md_var.h>
-#include <machine/pcb_ext.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 1124923..f0c25d6 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -185,14 +185,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/uio.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/mman.h>
#ifdef DEVFS
@@ -202,7 +196,6 @@
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index cdef3f5..ae48965 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: cy_pci.c,v 1.5 1997/02/22 09:44:00 peter Exp $
*/
/*
@@ -36,7 +36,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <vm/vm.h>
#include <vm/pmap.h>
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 05b7bc4..460c74a 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.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_de.c,v 1.65 1997/06/22 09:48:42 peter Exp $
+ * $Id: if_de.c,v 1.66 1997/08/03 13:00:42 peter Exp $
*
*/
@@ -39,17 +39,10 @@
#include <sys/param.h>
#include <sys/systm.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/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */
#if defined(__FreeBSD__)
#include <machine/clock.h>
#elif defined(__bsdi__) || defined(__NetBSD__)
@@ -60,9 +53,7 @@
#if defined(SIOCSIFMEDIA) && !defined(TULIP_NOIFMEDIA)
#include <net/if_media.h>
#endif
-#include <net/if_types.h>
#include <net/if_dl.h>
-#include <net/route.h>
#include <net/netisr.h>
#if defined(__bsdi__) && _BSDI_VERSION >= 199701
@@ -73,14 +64,10 @@
#include "bpfilter.h"
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
#endif
#ifdef NS
@@ -89,8 +76,6 @@
#endif
#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_kern.h>
#if defined(__FreeBSD__)
#include <vm/pmap.h>
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index a7bc08c..e122c81 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: if_sr_p.c,v 1.4 1997/02/22 09:44:07 peter Exp $
*/
#include "pci.h"
@@ -40,7 +40,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <pci/pcireg.h>
#include <pci/pcivar.h>
#ifndef BUGGY
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index b2d2278..b167b6f 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -31,17 +31,13 @@
* SUCH DAMAGE.
*
* @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: dead_vnops.c,v 1.13 1997/02/22 09:40:13 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
-#include <sys/errno.h>
-#include <sys/namei.h>
#include <sys/buf.h>
static int chkvnlock __P((struct vnode *));
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 3e849b5..8753b34 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94
*
- * $Id$
+ * $Id: fdesc_vnops.c,v 1.23 1997/02/22 09:40:15 peter Exp $
*/
/*
@@ -46,7 +46,6 @@
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/kernel.h> /* boottime */
-#include <sys/resourcevar.h>
#include <sys/filedesc.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
@@ -55,10 +54,8 @@
#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/buf.h>
#include <sys/dirent.h>
#include <sys/socketvar.h>
-#include <sys/tty.h>
#include <sys/conf.h>
#include <miscfs/fdesc/fdesc.h>
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index ce23c6e..41b50c5 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,24 +31,19 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.24 1997/03/24 11:37:53 bde Exp $
+ * $Id: fifo_vnops.c,v 1.25 1997/08/16 19:15:13 wollman Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/namei.h>
#include <sys/unistd.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/stat.h>
#include <sys/filio.h>
#include <sys/fcntl.h>
#include <sys/file.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/un.h>
#include <miscfs/fifofs/fifo.h>
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index ef57cef..23946ad 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_denode.c,v 1.23 1997/02/26 14:23:11 bde Exp $ */
+/* $Id: msdosfs_denode.c,v 1.25 1997/08/26 04:36:21 dyson Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */
/*-
@@ -55,11 +55,9 @@
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/types.h>
#include <sys/kernel.h> /* defines "time" */
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
#include <msdosfs/bpb.h>
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index be51ed5..9a3f5d7 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: msdosfs_fat.c,v 1.12 1997/02/22 09:40:47 peter Exp $ */
/* $NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $ */
/*-
@@ -54,11 +54,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/file.h>
-#include <sys/namei.h>
#include <sys/mount.h> /* to define statfs structure */
#include <sys/vnode.h> /* to define vattr structure */
-#include <sys/errno.h>
/*
* msdosfs include files.
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 9e7b095..7660bf0 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_lookup.c,v 1.11 1997/02/26 14:23:13 bde Exp $ */
+/* $Id: msdosfs_lookup.c,v 1.12 1997/08/26 07:32:38 phk Exp $ */
/* $NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $ */
/*-
@@ -54,7 +54,6 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <msdosfs/bpb.h>
#include <msdosfs/direntry.h>
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index b98fced..98119cb 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.39 1997/05/01 19:12:22 sos Exp $
+ * $Id: spec_vnops.c,v 1.40 1997/05/29 13:29:13 tegge Exp $
*/
#include <sys/param.h>
@@ -41,17 +41,14 @@
#include <sys/conf.h>
#include <sys/buf.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
#include <sys/stat.h>
-#include <sys/errno.h>
#include <sys/fcntl.h>
#include <sys/disklabel.h>
#include <sys/vmmeter.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/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 41ff607..f153f46 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,23 +35,20 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.37 1997/08/15 02:35:00 kato Exp $
+ * $Id: union_vnops.c,v 1.38 1997/08/15 02:36:28 kato Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/fcntl.h>
-#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/queue.h>
#include <sys/lock.h>
#include <miscfs/union/union.h>
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 227cbfe..c85cc37 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.14 1997/02/22 09:47:44 peter Exp $
+ * $Id: ufs_bmap.c,v 1.15 1997/03/09 06:10:31 mpp Exp $
*/
#include <sys/param.h>
@@ -47,8 +47,6 @@
#include <sys/mount.h>
#include <sys/resourcevar.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/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 227cbfe..c85cc37 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.14 1997/02/22 09:47:44 peter Exp $
+ * $Id: ufs_bmap.c,v 1.15 1997/03/09 06:10:31 mpp Exp $
*/
#include <sys/param.h>
@@ -47,8 +47,6 @@
#include <sys/mount.h>
#include <sys/resourcevar.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/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index 2030511..d3b02e3 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -32,13 +32,12 @@
*
* from tahoe: in_cksum.c 1.2 86/01/05
* from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91
- * $Id: in_cksum.c,v 1.10 1997/02/22 09:32:20 peter Exp $
+ * $Id: in_cksum.c,v 1.11 1997/08/16 19:14:52 wollman Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 1c4489c..ef25175 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.259 1997/08/31 23:08:27 bde Exp $
+ * $Id: machdep.c,v 1.260 1997/09/01 01:54:50 bde Exp $
*/
#include "apm.h"
@@ -100,13 +100,11 @@
#endif
#include <machine/cpu.h>
#include <machine/reg.h>
-#include <machine/psl.h>
#include <machine/clock.h>
#include <machine/specialreg.h>
#include <machine/cons.h>
#include <machine/bootinfo.h>
#include <machine/md_var.h>
-#include <machine/pcb_ext.h>
#ifdef SMP
#include <machine/smp.h>
#endif
diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s
index d4f313a..9cf5525 100644
--- a/sys/i386/i386/microtime.s
+++ b/sys/i386/i386/microtime.s
@@ -32,13 +32,12 @@
* SUCH DAMAGE.
*
* from: Steve McCanne's microtime code
- * $Id: microtime.s,v 1.8 1997/09/01 07:35:31 smp Exp smp $
+ * $Id: microtime.s,v 1.31 1997/09/01 07:45:37 fsmp Exp $
*/
#include "opt_cpu.h"
#include <machine/asmacros.h>
-#include <machine/param.h>
#include <i386/isa/icu.h>
#include <i386/isa/isa.h>
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index 811e068..2ae3e20 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -30,11 +30,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: support.s,v 1.55 1997/07/17 04:33:40 dyson Exp $
+ * $Id: support.s,v 1.56 1997/08/09 00:02:44 dyson Exp $
*/
#include "npx.h"
-#include "opt_cpu.h"
#include <machine/asmacros.h>
#include <machine/cputypes.h>
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 0d2c672..7c93b00 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $Id: vm_machdep.c,v 1.85 1997/08/09 00:02:56 dyson Exp $
+ * $Id: vm_machdep.c,v 1.86 1997/08/26 18:10:34 peter Exp $
*/
#include "npx.h"
@@ -55,7 +55,6 @@
#include <machine/clock.h>
#include <machine/cpu.h>
#include <machine/md_var.h>
-#include <machine/pcb_ext.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index 4c96903..7bc26e1 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,13 +23,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: imgact_aout.c,v 1.34 1997/04/13 01:48:21 dyson Exp $
+ * $Id: imgact_aout.c,v 1.35 1997/08/26 00:02:23 bde Exp $
*/
-#include "opt_rlimit.h"
-
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/resourcevar.h>
#include <sys/exec.h>
#include <sys/mman.h>
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 7d7643e..b588962 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: imgact_gzip.c,v 1.29 1997/04/13 01:48:22 dyson Exp $
+ * $Id: imgact_gzip.c,v 1.30 1997/08/26 00:02:24 bde Exp $
*
* This module handles execution of a.out files which have been run through
* "gzip". This saves diskspace, but wastes cpu-cycles and VM.
@@ -21,8 +21,6 @@
* tidy up unnecesary includes
*/
-#include "opt_rlimit.h"
-
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/imgact.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 4c4024a..1abc687 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,10 +39,9 @@
* SUCH DAMAGE.
*
* @(#)init_main.c 8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.69 1997/08/15 02:33:30 fsmp Exp $
+ * $Id: init_main.c,v 1.70 1997/08/26 18:10:37 peter Exp $
*/
-#include "opt_rlimit.h"
#include "opt_devfs.h"
#include <sys/param.h>
@@ -62,9 +61,6 @@
#include <sys/vmmeter.h>
#include <machine/cpu.h>
-#ifdef SMP
-#include <machine/smp.h>
-#endif /* SMP */
#include <vm/vm.h>
#include <vm/vm_param.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index f72d2d0..65aa4fc 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* @(#)kern_acct.c 8.1 (Berkeley) 6/14/93
- * $Id: kern_acct.c,v 1.14 1997/03/23 03:36:17 bde Exp $
+ * $Id: kern_acct.c,v 1.15 1997/03/24 11:24:34 bde Exp $
*/
#include <sys/param.h>
@@ -52,7 +52,6 @@
#include <sys/sysent.h>
#include <sys/sysctl.h>
#include <sys/namei.h>
-#include <sys/errno.h>
#include <sys/acct.h>
#include <sys/resourcevar.h>
#include <sys/tty.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 05ce91c..03de315 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.37 1997/06/24 18:20:47 jhay Exp $
+ * $Id: kern_clock.c,v 1.38 1997/08/21 20:33:38 bde Exp $
*/
/* Portions of this software are covered by the following: */
@@ -68,8 +68,6 @@
#include <sys/signalvar.h>
#include <sys/timex.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_exec.c b/sys/kern/kern_exec.c
index 3bf808c..d1fbf72 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: kern_exec.c,v 1.63 1997/04/23 22:07:05 ache Exp $
+ * $Id: kern_exec.c,v 1.64 1997/08/04 05:39:24 davidg Exp $
*/
#include <sys/param.h>
@@ -43,7 +43,6 @@
#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/sysent.h>
-#include <sys/syslog.h>
#include <sys/shm.h>
#include <sys/sysctl.h>
#include <sys/vnode.h>
@@ -59,8 +58,6 @@
#include <vm/vm_extern.h>
#include <vm/vm_object.h>
-#include <sys/user.h>
-
#include <machine/reg.h>
static int *exec_copyout_strings __P((struct image_params *));
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 9b568a3..7d326da 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_exit.c 8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.52 1997/08/21 20:33:38 bde Exp $
+ * $Id: kern_exit.c,v 1.53 1997/08/26 00:11:55 bde Exp $
*/
#include "opt_ktrace.h"
@@ -44,17 +44,10 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
-#include <sys/sysent.h>
#include <sys/proc.h>
#include <sys/tty.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
#include <sys/wait.h>
-#include <sys/file.h>
#include <sys/vnode.h>
-#include <sys/syslog.h>
#include <sys/malloc.h>
#include <sys/resourcevar.h>
#include <sys/signalvar.h>
@@ -73,11 +66,9 @@
#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>
-#include <vm/vm_kern.h>
static int wait1 __P((struct proc *, struct wait_args *, int [], int));
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 62ab7fc..ed2c7c6 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,12 +31,11 @@
* SUCH DAMAGE.
*
* @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.27 1997/06/24 09:41:00 davidg Exp $
+ * $Id: kern_malloc.c,v 1.28 1997/08/05 00:01:23 dyson Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index ac60e66..652c37a 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: kern_physio.c,v 1.20 1997/08/09 10:13:17 dyson Exp $
+ * $Id: kern_physio.c,v 1.21 1997/08/26 00:15:04 bde Exp $
*/
#include <sys/param.h>
@@ -25,7 +25,6 @@
#include <sys/conf.h>
#include <sys/proc.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
static void physwakeup __P((struct buf *bp));
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 9d0be80..caaeb02 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.21 1997/08/26 18:36:15 peter Exp $
+ * $Id: kern_shutdown.c,v 1.22 1997/08/31 23:08:38 bde Exp $
*/
#include "opt_ddb.h"
@@ -46,12 +46,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/reboot.h>
-#include <sys/msgbuf.h>
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <sys/tty.h>
-#include <sys/tprintf.h>
-#include <sys/syslog.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/mount.h>
@@ -67,7 +63,6 @@
#include <machine/smp.h> /* smp_active, cpuid */
#endif
-#include <sys/utsname.h>
#include <sys/signalvar.h>
#ifndef PANIC_REBOOT_WAIT_TIME
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 957d391..b73503e 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_sig.c 8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.31 1997/03/23 03:36:21 bde Exp $
+ * $Id: kern_sig.c,v 1.32 1997/08/26 00:31:04 bde Exp $
*/
#include "opt_ktrace.h"
@@ -50,12 +50,8 @@
#include <sys/vnode.h>
#include <sys/proc.h>
#include <sys/systm.h>
-#include <sys/timeb.h>
-#include <sys/times.h>
-#include <sys/buf.h>
#include <sys/acct.h>
#include <sys/fcntl.h>
-#include <sys/kernel.h>
#include <sys/wait.h>
#include <sys/ktrace.h>
#include <sys/syslog.h>
@@ -67,7 +63,6 @@
/* All these for coredump() only. */
#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_subr.c b/sys/kern/kern_subr.c
index 236824f..8596570 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,14 +36,13 @@
* SUCH DAMAGE.
*
* @(#)kern_subr.c 8.3 (Berkeley) 1/21/94
- * $Id: kern_subr.c,v 1.10 1997/02/22 09:39:11 peter Exp $
+ * $Id: kern_subr.c,v 1.11 1997/05/28 00:47:27 alex Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/malloc.h>
-#include <sys/queue.h>
int
uiomove(cp, n, uio)
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 493c9c1..87d6244 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,24 +36,20 @@
* SUCH DAMAGE.
*
* @(#)kern_synch.c 8.9 (Berkeley) 5/19/95
- * $Id: kern_synch.c,v 1.36 1997/08/18 01:34:38 julian Exp $
+ * $Id: kern_synch.c,v 1.37 1997/08/21 20:33:39 bde Exp $
*/
#include "opt_ktrace.h"
-#include "opt_smp.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/kernel.h>
-#include <sys/buf.h>
#include <sys/signalvar.h>
#include <sys/resourcevar.h>
-#include <sys/signalvar.h>
#include <sys/vmmeter.h>
#include <sys/sysctl.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
#ifdef KTRACE
#include <sys/ktrace.h>
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 05ce91c..03de315 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.37 1997/06/24 18:20:47 jhay Exp $
+ * $Id: kern_clock.c,v 1.38 1997/08/21 20:33:38 bde Exp $
*/
/* Portions of this software are covered by the following: */
@@ -68,8 +68,6 @@
#include <sys/signalvar.h>
#include <sys/timex.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_threads.c b/sys/kern/kern_threads.c
index 1e0b659..93a2290 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,26 +46,14 @@
* in Germany will I accept domestic beer. This code may or may not work
* and I certainly make no claims as to its fitness for *any* purpose.
*
- * $Id: kern_threads.c,v 1.1 1997/06/16 00:27:26 dyson Exp $
+ * $Id: kern_threads.c,v 1.2 1997/07/06 02:40:42 dyson Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/filedesc.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/proc.h>
-#include <sys/resourcevar.h>
-#include <sys/vnode.h>
-#include <sys/file.h>
-#include <sys/acct.h>
-#include <sys/ktrace.h>
#include <sys/sysproto.h>
-#include <sys/unistd.h>
-
-#include <vm/vm.h>
-
-#include <machine/cpu.h>
/*
* Low level support for sleep/wakeup paradigm
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index f84e9bb..8b68ea0 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)kern_time.c 8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.32 1997/08/14 08:15:12 ache Exp $
+ * $Id: kern_time.c,v 1.33 1997/08/26 00:40:04 bde Exp $
*/
#include <sys/param.h>
@@ -42,11 +42,9 @@
#include <sys/systm.h>
#include <sys/sysent.h>
#include <sys/proc.h>
-#include <sys/signal.h>
#include <sys/time.h>
#include <sys/vnode.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
struct timezone tz;
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 05ce91c..03de315 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.37 1997/06/24 18:20:47 jhay Exp $
+ * $Id: kern_clock.c,v 1.38 1997/08/21 20:33:38 bde Exp $
*/
/* Portions of this software are covered by the following: */
@@ -68,8 +68,6 @@
#include <sys/signalvar.h>
#include <sys/timex.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/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 44e01b0..28c7768 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $Id: subr_diskslice.c,v 1.35 1997/02/22 09:39:15 peter Exp $
+ * $Id: subr_diskslice.c,v 1.36 1997/03/24 11:24:37 bde Exp $
*/
#include <sys/param.h>
@@ -62,7 +62,6 @@
#include <sys/systm.h>
#include <sys/vnode.h>
-#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
#define TRACE(str) do { if (ds_debug) printf str; } while (0)
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 4b3ed36..a76cf7d 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: subr_prf.c,v 1.41 1997/02/22 09:39:17 peter Exp $
*/
-#include "opt_ddb.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/msgbuf.h>
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index ef29ce3..dead1a6 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,16 +54,13 @@
* functioning of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
- * $Id$
+ * $Id: subr_rlist.c,v 1.21 1997/02/22 09:39:18 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/rlist.h>
-#include <sys/proc.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/sys_generic.c b/sys/kern/sys_generic.c
index 4f0cc23..aea2165 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)sys_generic.c 8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.26 1997/03/24 11:52:25 bde Exp $
+ * $Id: sys_generic.c,v 1.27 1997/06/16 00:29:31 dyson Exp $
*/
#include "opt_ktrace.h"
@@ -50,18 +50,14 @@
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/proc.h>
-#include <sys/stat.h>
#include <sys/signalvar.h>
-#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/uio.h>
#include <sys/kernel.h>
-#include <sys/stat.h>
#include <sys/malloc.h>
#ifdef KTRACE
#include <sys/ktrace.h>
#endif
-#include <vm/vm.h>
static int selscan __P((struct proc *, fd_mask **, fd_mask **, int, int *));
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index cbf180f..35394dc 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: sys_pipe.c,v 1.30 1997/08/05 00:05:00 dyson Exp $
+ * $Id: sys_pipe.c,v 1.31 1997/08/05 22:24:17 dyson Exp $
*/
/*
@@ -54,19 +54,11 @@
#include <sys/proc.h>
#include <sys/fcntl.h>
#include <sys/file.h>
-#include <sys/protosw.h>
-#include <sys/stat.h>
#include <sys/filedesc.h>
-#include <sys/malloc.h>
#include <sys/filio.h>
#include <sys/ttycom.h>
#include <sys/stat.h>
-#include <sys/select.h>
#include <sys/signalvar.h>
-#include <sys/errno.h>
-#include <sys/queue.h>
-#include <sys/vmmeter.h>
-#include <sys/kernel.h>
#include <sys/sysproto.h>
#include <sys/pipe.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 05ad9ca..364fc9b 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: sys_process.c,v 1.28 1997/04/27 19:02:34 alex Exp $
+ * $Id: sys_process.c,v 1.29 1997/04/27 21:26:29 alex Exp $
*/
#include <sys/param.h>
@@ -37,20 +37,14 @@
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/ptrace.h>
-#include <sys/errno.h>
-#include <sys/queue.h>
#include <machine/reg.h>
-#include <machine/psl.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>
-#include <vm/vm_object.h>
#include <vm/vm_page.h>
-#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
#include <sys/user.h>
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index f6e14f9..0c023ea 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)tty.c 8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.93 1997/03/23 03:36:26 bde Exp $
+ * $Id: tty.c,v 1.94 1997/03/24 12:02:59 bde Exp $
*/
/*-
@@ -83,10 +83,8 @@
#include <sys/fcntl.h>
#include <sys/conf.h>
#include <sys/dkstat.h>
-#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
-#include <sys/syslog.h>
#include <sys/signalvar.h>
#include <sys/resourcevar.h>
#include <sys/malloc.h>
@@ -95,8 +93,6 @@
#endif
#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/tty_pty.c b/sys/kern/tty_pty.c
index f721b41..cc46c2a 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tty_pty.c 8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.43 1997/03/24 12:03:06 bde Exp $
+ * $Id: tty_pty.c,v 1.44 1997/07/30 10:05:18 jmg Exp $
*/
/*
@@ -49,7 +49,6 @@
#include <sys/tty.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
-#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/signalvar.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index be164d5..bc0de91 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,14 +31,13 @@
* SUCH DAMAGE.
*
* @(#)tty_tty.c 8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.15 1997/03/23 03:36:30 bde Exp $
+ * $Id: tty_tty.c,v 1.16 1997/03/24 11:24:38 bde Exp $
*/
/*
* Indirect driver for controlling tty.
*/
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/tty.h>
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index b20b9ee..5059cd5 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -31,15 +31,13 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.26 1997/07/19 20:15:35 fenner Exp $
+ * $Id: uipc_socket2.c,v 1.27 1997/08/16 19:15:05 wollman Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 46ac263..cd8830d 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,11 +31,10 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94
- * $Id: uipc_socket.c,v 1.28 1997/08/16 19:15:04 wollman Exp $
+ * $Id: uipc_socket.c,v 1.29 1997/08/21 20:33:39 bde Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/fcntl.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index b20b9ee..5059cd5 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,15 +31,13 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.26 1997/07/19 20:15:35 fenner Exp $
+ * $Id: uipc_socket2.c,v 1.27 1997/08/16 19:15:05 wollman Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/file.h>
-#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index f8275d5..8b18787 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.27 1997/08/16 19:15:06 wollman Exp $
+ * $Id: uipc_syscalls.c,v 1.29 1997/08/17 19:47:28 wollman Exp $
*/
#include "opt_ktrace.h"
@@ -43,15 +43,12 @@
#include <sys/proc.h>
#include <sys/fcntl.h>
#include <sys/file.h>
-#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
-#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/signalvar.h>
-#include <sys/un.h>
#ifdef KTRACE
#include <sys/ktrace.h>
#endif
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index a18798d..4bc70096 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,11 +31,10 @@
* SUCH DAMAGE.
*
* From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94
- * $Id: uipc_usrreq.c,v 1.24 1997/08/16 19:15:06 wollman Exp $
+ * $Id: uipc_usrreq.c,v 1.25 1997/09/02 01:18:23 bde Exp $
*/
#include <sys/param.h>
-#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/domain.h>
@@ -52,7 +51,6 @@
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/un.h>
-#include <sys/unpcb.h>
#include <sys/vnode.h>
/*
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 26a79476..e1ed37b 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
* bad that happens because of using this software isn't the responsibility
* of the author. This software is distributed AS-IS.
*
- * $Id: vfs_aio.c,v 1.2 1997/07/06 02:40:43 dyson Exp $
+ * $Id: vfs_aio.c,v 1.3 1997/07/17 04:49:31 dyson Exp $
*/
/*
@@ -31,31 +31,23 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/sysent.h>
#include <sys/sysproto.h>
-#include <sys/namei.h>
#include <sys/filedesc.h>
#include <sys/kernel.h>
#include <sys/fcntl.h>
#include <sys/file.h>
-#include <sys/stat.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
-#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/uio.h>
#include <sys/malloc.h>
-#include <sys/dirent.h>
#include <sys/signalvar.h>
-#include <sys/queue.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/vm_object.h>
#include <vm/vm_extern.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
-#include <sys/sysctl.h>
#include <sys/aio.h>
#include <sys/shm.h>
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index f4f52bb..18c4b8b 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -34,18 +34,16 @@
* SUCH DAMAGE.
*
* @(#)vfs_cache.c 8.5 (Berkeley) 3/22/95
- * $Id: vfs_cache.c,v 1.27 1997/08/26 07:32:34 phk Exp $
+ * $Id: vfs_cache.c,v 1.28 1997/08/31 07:32:13 phk Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
-#include <sys/time.h>
#include <sys/mount.h>
#include <sys/vnode.h>
#include <sys/namei.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 6358781..f4e4885 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.95 1997/08/26 11:59:20 bde Exp $
+ * $Id: vfs_subr.c,v 1.96 1997/08/31 07:32:14 phk Exp $
*/
/*
@@ -48,28 +48,20 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/file.h>
#include <sys/proc.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/domain.h>
-#include <sys/mbuf.h>
#include <sys/dirent.h>
#include <machine/limits.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
-#include <vm/vm_pager.h>
#include <vm/vnode_pager.h>
#include <sys/sysctl.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 03576ec..e28f93b 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.65 1997/04/04 17:47:41 dfr Exp $
+ * $Id: vfs_syscalls.c,v 1.66 1997/07/17 07:17:33 dfr Exp $
*/
/*
@@ -62,7 +62,6 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/proc.h>
-#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/dirent.h>
@@ -71,7 +70,6 @@
#endif
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
#include <sys/sysctl.h>
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 4c10a2f..97a29d6 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,19 +36,16 @@
* SUCH DAMAGE.
*
* @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.17 1997/04/04 17:46:13 dfr Exp $
+ * $Id: vfs_lookup.c,v 1.18 1997/04/04 17:47:43 dfr Exp $
*/
#include "opt_ktrace.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/syslimits.h>
-#include <sys/time.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/filedesc.h>
#include <sys/proc.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 6358781..f4e4885 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.95 1997/08/26 11:59:20 bde Exp $
+ * $Id: vfs_subr.c,v 1.96 1997/08/31 07:32:14 phk Exp $
*/
/*
@@ -48,28 +48,20 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/file.h>
#include <sys/proc.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/domain.h>
-#include <sys/mbuf.h>
#include <sys/dirent.h>
#include <machine/limits.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
-#include <vm/vm_pager.h>
#include <vm/vnode_pager.h>
#include <sys/sysctl.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 03576ec..e28f93b 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.65 1997/04/04 17:47:41 dfr Exp $
+ * $Id: vfs_syscalls.c,v 1.66 1997/07/17 07:17:33 dfr Exp $
*/
/*
@@ -62,7 +62,6 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/proc.h>
-#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/dirent.h>
@@ -71,7 +70,6 @@
#endif
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
#include <sys/sysctl.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index a294cdd..4c655564 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,16 +36,14 @@
* SUCH DAMAGE.
*
* @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.35 1997/04/04 17:46:21 dfr Exp $
+ * $Id: vfs_vnops.c,v 1.36 1997/04/04 17:47:40 dfr Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/kernel.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/stat.h>
-#include <sys/buf.h>
#include <sys/proc.h>
#include <sys/mount.h>
#include <sys/namei.h>
@@ -53,11 +51,6 @@
#include <sys/filio.h>
#include <sys/ttycom.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_object.h>
-#include <vm/vnode_pager.h>
-
static int vn_closefile __P((struct file *fp, struct proc *p));
static int vn_ioctl __P((struct file *fp, int com, caddr_t data,
struct proc *p));
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index b2d2278..b167b6f 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -31,17 +31,13 @@
* SUCH DAMAGE.
*
* @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: dead_vnops.c,v 1.13 1997/02/22 09:40:13 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
-#include <sys/errno.h>
-#include <sys/namei.h>
#include <sys/buf.h>
static int chkvnlock __P((struct vnode *));
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 3e849b5..8753b34 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94
*
- * $Id$
+ * $Id: fdesc_vnops.c,v 1.23 1997/02/22 09:40:15 peter Exp $
*/
/*
@@ -46,7 +46,6 @@
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/kernel.h> /* boottime */
-#include <sys/resourcevar.h>
#include <sys/filedesc.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
@@ -55,10 +54,8 @@
#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/buf.h>
#include <sys/dirent.h>
#include <sys/socketvar.h>
-#include <sys/tty.h>
#include <sys/conf.h>
#include <miscfs/fdesc/fdesc.h>
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index ce23c6e..41b50c5 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,24 +31,19 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.24 1997/03/24 11:37:53 bde Exp $
+ * $Id: fifo_vnops.c,v 1.25 1997/08/16 19:15:13 wollman Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/time.h>
-#include <sys/namei.h>
#include <sys/unistd.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/stat.h>
#include <sys/filio.h>
#include <sys/fcntl.h>
#include <sys/file.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/un.h>
#include <miscfs/fifofs/fifo.h>
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 49da960..bcd3c87 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95
- * $Id$
+ * $Id: kernfs_vnops.c,v 1.19 1997/02/22 09:40:19 peter Exp $
*/
/*
@@ -45,17 +45,13 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/vmmeter.h>
-#include <sys/types.h>
#include <sys/time.h>
-#include <sys/proc.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
-#include <sys/fcntl.h>
#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/buf.h>
#include <sys/dirent.h>
#include <miscfs/kernfs/kernfs.h>
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index b98fced..98119cb 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.39 1997/05/01 19:12:22 sos Exp $
+ * $Id: spec_vnops.c,v 1.40 1997/05/29 13:29:13 tegge Exp $
*/
#include <sys/param.h>
@@ -41,17 +41,14 @@
#include <sys/conf.h>
#include <sys/buf.h>
#include <sys/mount.h>
-#include <sys/namei.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
#include <sys/stat.h>
-#include <sys/errno.h>
#include <sys/fcntl.h>
#include <sys/disklabel.h>
#include <sys/vmmeter.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/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 41ff607..f153f46 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,23 +35,20 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.37 1997/08/15 02:35:00 kato Exp $
+ * $Id: union_vnops.c,v 1.38 1997/08/15 02:36:28 kato Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/fcntl.h>
-#include <sys/time.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/queue.h>
#include <sys/lock.h>
#include <miscfs/union/union.h>
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index ef57cef..23946ad 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_denode.c,v 1.23 1997/02/26 14:23:11 bde Exp $ */
+/* $Id: msdosfs_denode.c,v 1.25 1997/08/26 04:36:21 dyson Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */
/*-
@@ -55,11 +55,9 @@
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/types.h>
#include <sys/kernel.h> /* defines "time" */
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
#include <msdosfs/bpb.h>
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index be51ed5..9a3f5d7 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: msdosfs_fat.c,v 1.12 1997/02/22 09:40:47 peter Exp $ */
/* $NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $ */
/*-
@@ -54,11 +54,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/file.h>
-#include <sys/namei.h>
#include <sys/mount.h> /* to define statfs structure */
#include <sys/vnode.h> /* to define vattr structure */
-#include <sys/errno.h>
/*
* msdosfs include files.
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index 9e7b095..7660bf0 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_lookup.c,v 1.11 1997/02/26 14:23:13 bde Exp $ */
+/* $Id: msdosfs_lookup.c,v 1.12 1997/08/26 07:32:38 phk Exp $ */
/* $NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $ */
/*-
@@ -54,7 +54,6 @@
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <msdosfs/bpb.h>
#include <msdosfs/direntry.h>
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 1124923..f0c25d6 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -185,14 +185,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
#include <sys/uio.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/mman.h>
#ifdef DEVFS
@@ -202,7 +196,6 @@
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index cdef3f5..ae48965 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: cy_pci.c,v 1.5 1997/02/22 09:44:00 peter Exp $
*/
/*
@@ -36,7 +36,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
#include <vm/vm.h>
#include <vm/pmap.h>
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 05b7bc4..460c74a 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.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_de.c,v 1.65 1997/06/22 09:48:42 peter Exp $
+ * $Id: if_de.c,v 1.66 1997/08/03 13:00:42 peter Exp $
*
*/
@@ -39,17 +39,10 @@
#include <sys/param.h>
#include <sys/systm.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/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h> /* only for declaration of wakeup() used by vm.h */
#if defined(__FreeBSD__)
#include <machine/clock.h>
#elif defined(__bsdi__) || defined(__NetBSD__)
@@ -60,9 +53,7 @@
#if defined(SIOCSIFMEDIA) && !defined(TULIP_NOIFMEDIA)
#include <net/if_media.h>
#endif
-#include <net/if_types.h>
#include <net/if_dl.h>
-#include <net/route.h>
#include <net/netisr.h>
#if defined(__bsdi__) && _BSDI_VERSION >= 199701
@@ -73,14 +64,10 @@
#include "bpfilter.h"
#if NBPFILTER > 0
#include <net/bpf.h>
-#include <net/bpfdesc.h>
#endif
#ifdef INET
#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
#endif
#ifdef NS
@@ -89,8 +76,6 @@
#endif
#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_kern.h>
#if defined(__FreeBSD__)
#include <vm/pmap.h>
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index a7bc08c..e122c81 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.c
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: if_sr_p.c,v 1.4 1997/02/22 09:44:07 peter Exp $
*/
#include "pci.h"
@@ -40,7 +40,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <pci/pcireg.h>
#include <pci/pcivar.h>
#ifndef BUGGY
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index fce922d..a434e21 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -150,26 +150,18 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
#include <sys/signalvar.h>
#include <sys/mman.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#endif /* DEVFS */
-#include <machine/clock.h>
#if defined(METEOR_FreeBSD_210)
#include <machine/cpu.h> /* bootverbose */
#endif
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 00df2f7..448eedf 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*
- * $Id: cd.c,v 1.82 1997/04/02 09:05:38 jmg Exp $
+ * $Id: cd.c,v 1.83 1997/05/04 15:24:22 joerg Exp $
*/
#include "opt_bounce.h"
@@ -22,18 +22,13 @@
#define SPLCD splbio
#define ESUCCESS 0
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/dkbad.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
-#include <sys/stat.h>
#include <sys/buf.h>
-#include <sys/uio.h>
-#include <sys/malloc.h>
#include <sys/cdio.h>
-#include <sys/errno.h>
#include <sys/disklabel.h>
#include <sys/dkstat.h>
#include <sys/kernel.h>
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index f8c5e57..f68f65a 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -33,16 +33,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ch.c,v 1.39 1997/03/24 04:26:46 bde Exp $
+ * $Id: ch.c,v 1.40 1997/03/24 11:24:55 bde Exp $
*/
-#include "opt_scsi.h"
-
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/chio.h>
#include <sys/conf.h>
#include <sys/kernel.h>
@@ -51,12 +46,10 @@
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#include <scsi/scsi_all.h>
#include <scsi/scsi_changer.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_driver.h>
-#include "ch.h"
#define CHRETRIES 2
#define CHUNIT(x) (minor((x)))
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 5f69a35..7c983eb 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: od.c,v 1.29 1997/03/23 06:33:45 bde Exp $
+ * $Id: od.c,v 1.30 1997/03/24 11:25:01 bde Exp $
*/
/*
@@ -60,33 +60,23 @@
#include "opt_od.h"
#define SPLOD splbio
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/dkbad.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/stat.h>
#include <sys/buf.h>
-#include <sys/uio.h>
-#include <sys/malloc.h>
#include <sys/cdio.h>
-#include <sys/errno.h>
#include <sys/dkstat.h>
#include <sys/disklabel.h>
#include <sys/diskslice.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
-#include <vm/vm.h>
-#include <sys/dkstat.h>
-#include <machine/md_var.h>
static u_int32_t odstrats, odqueues;
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c
index 1791aa4..9aa1692 100644
--- a/sys/scsi/pt.c
+++ b/sys/scsi/pt.c
@@ -37,7 +37,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: pt.c,v 1.21 1997/03/23 06:33:45 bde Exp $
+ * $Id: pt.c,v 1.22 1997/05/21 19:35:10 joerg Exp $
*/
#include "opt_bounce.h"
@@ -46,13 +46,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index d4b4f77..4d18568 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -8,7 +8,7 @@
* file.
*
* Written by Julian Elischer (julian@dialix.oz.au)
- * $Id: scsi_base.c,v 1.48 1997/04/04 19:37:20 gibbs Exp $
+ * $Id: scsi_base.c,v 1.49 1997/07/25 23:25:20 jdp Exp $
*/
#include "opt_bounce.h"
@@ -16,15 +16,10 @@
#define SPLSD splbio
#define ESUCCESS 0
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
#include <sys/buf.h>
-#include <sys/uio.h>
#include <sys/malloc.h>
-#include <sys/errno.h>
#include <machine/clock.h>
@@ -32,7 +27,6 @@
#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
diff --git a/sys/scsi/scsi_driver.c b/sys/scsi/scsi_driver.c
index 7678421..d71d6b7 100644
--- a/sys/scsi/scsi_driver.c
+++ b/sys/scsi/scsi_driver.c
@@ -35,21 +35,16 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scsi_driver.c,v 1.24 1997/06/25 19:07:42 tegge Exp $
+ * $Id: scsi_driver.c,v 1.25 1997/09/02 04:37:57 bde Exp $
*
*/
#include "opt_scsi.h"
-#include <sys/types.h>
-#include <sys/errno.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/malloc.h>
-#include <sys/fcntl.h>
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index 86a4f7e..8484a7d 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*End copyright
*
- * $Id: scsi_ioctl.c,v 1.24 1997/02/22 09:44:33 peter Exp $
+ * $Id: scsi_ioctl.c,v 1.25 1997/03/23 06:33:48 bde Exp $
*
*
*/
@@ -46,7 +46,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/buf.h>
@@ -55,10 +54,7 @@
#include <sys/fcntl.h>
#include <sys/proc.h>
-#include <vm/vm.h>
-#include "scbus.h"
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <sys/scsiio.h>
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 79c9728..c59b344 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -16,15 +16,13 @@
*
* New configuration setup: dufault@hda.com
*
- * $Id: scsiconf.c,v 1.88 1997/05/25 14:20:28 joerg Exp $
+ * $Id: scsiconf.c,v 1.89 1997/06/11 22:29:01 se Exp $
*/
#include "opt_scsi.h"
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/stat.h>
#include <sys/malloc.h>
#include <sys/conf.h>
#ifdef PC98
@@ -33,8 +31,6 @@
#include <machine/clock.h>
-#include "scbus.h"
-
#include "sd.h"
#include "st.h"
#include "cd.h"
@@ -43,10 +39,8 @@
#include "pt.h"
#include "worm.h"
-#include "su.h"
#include "sctarg.h"
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c
index 3015e2a..99549be 100644
--- a/sys/scsi/sctarg.c
+++ b/sys/scsi/sctarg.c
@@ -37,7 +37,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: sctarg.c,v 1.19 1997/02/22 09:44:36 peter Exp $
+ * $Id: sctarg.c,v 1.20 1997/03/23 06:33:51 bde Exp $
*/
#include "opt_bounce.h"
@@ -46,13 +46,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 4578cc7..fe7ba61 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -15,7 +15,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
*
- * $Id: sd.c,v 1.106 1997/06/25 19:07:43 tegge Exp $
+ * $Id: sd.c,v 1.107 1997/08/09 01:44:22 julian Exp $
*/
#include "opt_bounce.h"
@@ -30,21 +30,17 @@
#include <sys/disklabel.h>
#include <sys/diskslice.h>
#include <sys/dkstat.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
#include <sys/conf.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_driver.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_prot.h>
#include <vm/pmap.h>
#include <machine/md_var.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index c00fe71..9f419e0 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: st.c,v 1.78 1997/03/24 11:25:03 bde Exp $
+ * $Id: st.c,v 1.79 1997/08/23 21:05:32 steve Exp $
*/
/*
@@ -30,16 +30,12 @@
#include "opt_bounce.h"
#include "opt_scsi.h"
-#include <sys/types.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/fcntl.h>
-#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/mtio.h>
#include <sys/conf.h>
#include <sys/kernel.h>
@@ -47,7 +43,6 @@
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#include <scsi/scsi_all.h>
#include <scsi/scsi_tape.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
diff --git a/sys/scsi/su.c b/sys/scsi/su.c
index cd4492c..434d9fd 100644
--- a/sys/scsi/su.c
+++ b/sys/scsi/su.c
@@ -44,7 +44,7 @@
* SUCH DAMAGE.
*End copyright
*
- * $Id$
+ * $Id: su.c,v 1.16 1997/02/22 09:44:40 peter Exp $
*
* Tabstops 4
* XXX devfs entries for this device should be handled by generic scsiconfig
@@ -53,15 +53,9 @@
#include <sys/param.h>
#include <sys/conf.h>
-#include <sys/errno.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <sys/buf.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif /*DEVFS*/
#include <scsi/scsiconf.h>
#define CDEV_MAJOR 18
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index 785a349..11d22fc 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: worm.c,v 1.43 1997/07/26 15:07:42 jmz Exp $
+ * $Id: worm.c,v 1.44 1997/08/01 12:48:35 jmz Exp $
*/
#include "opt_bounce.h"
@@ -52,7 +52,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/proc.h>
#include <sys/cdio.h>
#include <sys/wormio.h>
#include <sys/fcntl.h>
@@ -61,7 +60,6 @@
#ifdef DEVFS
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
#include <scsi/scsi_debug.h>
#include <scsi/scsi_disk.h>
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 2edfa10..d45cd2e 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95
- * $Id: ffs_alloc.c,v 1.33 1997/03/23 20:08:16 guido Exp $
+ * $Id: ffs_alloc.c,v 1.34 1997/08/04 07:30:43 phk Exp $
*/
#include "opt_quota.h"
@@ -46,11 +46,8 @@
#include <sys/sysctl.h>
#include <sys/syslog.h>
-#include <vm/vm.h>
-
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufs_extern.h>
#include <ufs/ffs/fs.h>
#include <ufs/ffs/ffs_extern.h>
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 020b08d..99dc77b 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_inode.c 8.13 (Berkeley) 4/21/95
- * $Id: ffs_inode.c,v 1.25 1997/02/22 09:47:03 peter Exp $
+ * $Id: ffs_inode.c,v 1.26 1997/03/22 06:53:29 bde Exp $
*/
#include "opt_quota.h"
@@ -40,7 +40,6 @@
#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>
@@ -48,13 +47,10 @@
#include <sys/resourcevar.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_extern.h>
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
#include <ufs/ffs/fs.h>
#include <ufs/ffs/ffs_extern.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index ef256be..14ef397 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.52 1997/03/24 11:25:07 bde Exp $
+ * $Id: ffs_vfsops.c,v 1.53 1997/08/16 19:16:20 wollman Exp $
*/
#include "opt_quota.h"
@@ -42,13 +42,10 @@
#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
-#include <sys/socket.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 <miscfs/specfs/specdev.h>
@@ -62,10 +59,8 @@
#include <ufs/ffs/ffs_extern.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_prot.h>
#include <vm/vm_page.h>
-#include <vm/vm_object.h>
#include <vm/vm_extern.h>
static int ffs_sbupdate __P((struct ufsmount *, int));
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 35274bf..256488a 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.26 1997/08/25 08:18:23 kato Exp $
+ * $Id: ffs_vnops.c,v 1.27 1997/08/26 07:32:48 phk Exp $
*/
#include <sys/param.h>
@@ -39,19 +39,15 @@
#include <sys/resourcevar.h>
#include <sys/signalvar.h>
#include <sys/kernel.h>
-#include <sys/file.h>
#include <sys/stat.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/conf.h>
#include <sys/mount.h>
#include <sys/sysctl.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
-#include <sys/lockf.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_prot.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
@@ -62,7 +58,6 @@
#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_inode.c b/sys/ufs/lfs/lfs_inode.c
index 48297dc..545c1df 100644
--- a/sys/ufs/lfs/lfs_inode.c
+++ b/sys/ufs/lfs/lfs_inode.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)lfs_inode.c 8.9 (Berkeley) 5/8/95
- * $Id: lfs_inode.c,v 1.16 1997/03/22 06:53:37 bde Exp $
+ * $Id: lfs_inode.c,v 1.17 1997/03/22 09:33:55 bde Exp $
*/
#include "opt_quota.h"
@@ -39,15 +39,11 @@
#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 <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_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index 2879cf8..cd9d9e5 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,29 +31,24 @@
* SUCH DAMAGE.
*
* @(#)lfs_vnops.c 8.13 (Berkeley) 6/10/95
- * $Id: lfs_vnops.c,v 1.20 1997/03/22 06:53:38 bde Exp $
+ * $Id: lfs_vnops.c,v 1.21 1997/03/23 00:45:27 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/namei.h>
#include <sys/resourcevar.h>
#include <sys/signalvar.h>
#include <sys/kernel.h>
-#include <sys/file.h>
#include <sys/stat.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/conf.h>
#include <sys/mount.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/vm_prot.h>
#include <vm/vm_page.h>
-#include <vm/vm_object.h>
#include <vm/vm_extern.h>
#include <miscfs/specfs/specdev.h>
@@ -61,8 +56,6 @@
#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>
#include <ufs/lfs/lfs.h>
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index e4b4d35..5f4f371 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,26 +31,20 @@
* SUCH DAMAGE.
*
* @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95
- * $Id: mfs_vfsops.c,v 1.29 1997/03/24 11:25:10 bde Exp $
+ * $Id: mfs_vfsops.c,v 1.30 1997/04/28 09:15:18 jkh Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/buf.h>
-#include <sys/mbuf.h>
-#include <sys/file.h>
-#include <sys/disklabel.h>
#include <sys/mount.h>
#include <sys/signalvar.h>
#include <sys/vnode.h>
#include <sys/malloc.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/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 227cbfe..c85cc37 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.14 1997/02/22 09:47:44 peter Exp $
+ * $Id: ufs_bmap.c,v 1.15 1997/03/09 06:10:31 mpp Exp $
*/
#include <sys/param.h>
@@ -47,8 +47,6 @@
#include <sys/mount.h>
#include <sys/resourcevar.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/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index c3166ad..a4f3f6c 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -36,22 +36,17 @@
* SUCH DAMAGE.
*
* @(#)ufs_inode.c 8.9 (Berkeley) 5/14/95
- * $Id: ufs_inode.c,v 1.13 1997/08/22 03:56:35 dyson Exp $
+ * $Id: ufs_inode.c,v 1.14 1997/08/26 04:36:26 dyson Exp $
*/
#include "opt_quota.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/ufs_extern.h>
u_long nextgennumber; /* Next generation number to assign. */
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 3d32aa8..1762fb0 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,14 +36,13 @@
* SUCH DAMAGE.
*
* @(#)ufs_lookup.c 8.15 (Berkeley) 6/16/95
- * $Id: ufs_lookup.c,v 1.14 1997/03/31 12:02:49 peter Exp $
+ * $Id: ufs_lookup.c,v 1.15 1997/08/26 07:32:51 phk Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
#include <sys/buf.h>
-#include <sys/file.h>
#include <sys/mount.h>
#include <sys/vnode.h>
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index fc60e85..471977f 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.54 1997/08/22 15:37:23 dyson Exp $
+ * $Id: ufs_vnops.c,v 1.55 1997/08/26 04:36:27 dyson Exp $
*/
#include "opt_quota.h"
@@ -44,13 +44,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
-#include <sys/resourcevar.h>
#include <sys/kernel.h>
#include <sys/fcntl.h>
#include <sys/stat.h>
#include <sys/buf.h>
#include <sys/proc.h>
-#include <sys/conf.h>
#include <sys/mount.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
@@ -58,8 +56,6 @@
#include <sys/dirent.h>
#include <sys/lockf.h>
-#include <vm/vm.h>
-
#include <miscfs/specfs/specdev.h>
#include <miscfs/fifofs/fifo.h>
@@ -75,7 +71,6 @@ static int ufs_chown
#ifdef EXT2FS
#include <gnu/ext2fs/ext2_extern.h>
-#include <gnu/ext2fs/ext2_fs.h>
#include <gnu/ext2fs/ext2_fs_sb.h>
#endif /* EXT2FS */
OpenPOWER on IntegriCloud