summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/amd64/fpu.c3
-rw-r--r--sys/amd64/amd64/locore.S3
-rw-r--r--sys/amd64/amd64/locore.s3
-rw-r--r--sys/amd64/isa/npx.c3
-rw-r--r--sys/dev/bktr/bktr_core.c1
-rw-r--r--sys/dev/ed/if_ed.c3
-rw-r--r--sys/dev/ep/if_ep.c3
-rw-r--r--sys/dev/ppbus/pps.c3
-rw-r--r--sys/gnu/ext2fs/ext2_inode.c2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_inode.c2
-rw-r--r--sys/i386/i386/locore.s3
-rw-r--r--sys/i386/isa/bt5xx-445.c4
-rw-r--r--sys/i386/isa/if_ed.c3
-rw-r--r--sys/i386/isa/if_ep.c3
-rw-r--r--sys/i386/isa/npx.c3
-rw-r--r--sys/i386/isa/seagate.c4
-rw-r--r--sys/i386/isa/wst.c3
-rw-r--r--sys/kern/kern_synch.c3
-rw-r--r--sys/kern/vfs_export.c6
-rw-r--r--sys/kern/vfs_subr.c6
-rw-r--r--sys/pc98/pc98/wst.c3
-rw-r--r--sys/pci/brooktree848.c1
-rw-r--r--sys/vm/vm_mmap.c3
-rw-r--r--sys/vm/vm_page.c3
-rw-r--r--sys/vm/vm_page.h6
25 files changed, 21 insertions, 59 deletions
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 0eb8707..869111f 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.59 1998/04/15 18:58:09 bde Exp $
+ * $Id: npx.c,v 1.60 1998/04/19 15:39:26 bde Exp $
*/
#include "npx.h"
@@ -46,7 +46,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/sysctl.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#ifdef NPX_DEBUG
#include <sys/syslog.h>
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index a197c9a..91e2fa1 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.107 1998/04/06 15:42:26 peter Exp $
+ * $Id: locore.s,v 1.108 1998/06/03 01:59:42 msmith Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -45,7 +45,6 @@
#include "apm.h"
#include "opt_bootp.h"
-#include "opt_cpu.h"
#include "opt_ddb.h"
#include "opt_nfs.h"
#include "opt_userconfig.h"
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index a197c9a..91e2fa1 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.107 1998/04/06 15:42:26 peter Exp $
+ * $Id: locore.s,v 1.108 1998/06/03 01:59:42 msmith Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -45,7 +45,6 @@
#include "apm.h"
#include "opt_bootp.h"
-#include "opt_cpu.h"
#include "opt_ddb.h"
#include "opt_nfs.h"
#include "opt_userconfig.h"
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index 0eb8707..869111f 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.59 1998/04/15 18:58:09 bde Exp $
+ * $Id: npx.c,v 1.60 1998/04/19 15:39:26 bde Exp $
*/
#include "npx.h"
@@ -46,7 +46,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/sysctl.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#ifdef NPX_DEBUG
#include <sys/syslog.h>
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 3687fe7..c2d8e2d 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -298,7 +298,6 @@
#include <machine/ioctl_meteor.h>
#include <machine/ioctl_bt848.h> /* extensions to ioctl_meteor.h */
#include <pci/brktree_reg.h>
-#include <vm/vm.h>
#include <sys/sysctl.h>
static int bt848_card = -1;
static int bt848_tuner = -1;
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index d5d6ad9..83f537d 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ed.c,v 1.141 1998/06/07 17:10:26 dfr Exp $
+ * $Id: if_ed.c,v 1.142 1998/06/17 14:01:00 bde Exp $
*/
/*
@@ -53,7 +53,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/conf.h>
#include <sys/sockio.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 9087bb5..80b8db4 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
*/
/*
- * $Id: if_ep.c,v 1.74 1998/03/28 13:24:01 bde Exp $
+ * $Id: if_ep.c,v 1.75 1998/06/07 17:10:28 dfr Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@@ -67,7 +67,6 @@
#if defined(__FreeBSD__)
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/conf.h>
#endif
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 4a17eb161..fa975d2 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: pps.c,v 1.7 1998/06/12 23:15:53 phk Exp $
+ * $Id: pps.c,v 1.8 1998/06/13 09:30:10 phk Exp $
*
* This driver implements a draft-mogul-pps-api-02.txt PPS source.
*
@@ -21,7 +21,6 @@
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/conf.h>
-#include <sys/uio.h>
#include <sys/timepps.h>
#ifdef DEVFS
#include <sys/devfsext.h>
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index 92ea5bf..f6cc413 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -46,9 +46,7 @@
#include <sys/mount.h>
#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/time.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 92ea5bf..f6cc413 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -46,9 +46,7 @@
#include <sys/mount.h>
#include <sys/buf.h>
#include <sys/vnode.h>
-#include <sys/kernel.h>
#include <sys/malloc.h>
-#include <sys/time.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index a197c9a..91e2fa1 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.107 1998/04/06 15:42:26 peter Exp $
+ * $Id: locore.s,v 1.108 1998/06/03 01:59:42 msmith Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -45,7 +45,6 @@
#include "apm.h"
#include "opt_bootp.h"
-#include "opt_cpu.h"
#include "opt_ddb.h"
#include "opt_nfs.h"
#include "opt_userconfig.h"
diff --git a/sys/i386/isa/bt5xx-445.c b/sys/i386/isa/bt5xx-445.c
index 0bac9ac..212993e 100644
--- a/sys/i386/isa/bt5xx-445.c
+++ b/sys/i386/isa/bt5xx-445.c
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: bt5xx-445.c,v 1.7 1997/03/23 04:39:30 bde Exp $
+ * $Id: bt5xx-445.c,v 1.8 1997/07/20 14:09:51 bde Exp $
*/
/*
@@ -38,8 +38,6 @@
#include <i386/isa/isa_device.h>
#include <i386/scsi/btreg.h>
-#include "ioconf.h"
-
static int bt_isa_probe __P((struct isa_device *dev));
static int bt_isa_attach __P((struct isa_device *dev));
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index d5d6ad9..83f537d 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ed.c,v 1.141 1998/06/07 17:10:26 dfr Exp $
+ * $Id: if_ed.c,v 1.142 1998/06/17 14:01:00 bde Exp $
*/
/*
@@ -53,7 +53,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/conf.h>
#include <sys/sockio.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 9087bb5..80b8db4 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
*/
/*
- * $Id: if_ep.c,v 1.74 1998/03/28 13:24:01 bde Exp $
+ * $Id: if_ep.c,v 1.75 1998/06/07 17:10:28 dfr Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@@ -67,7 +67,6 @@
#if defined(__FreeBSD__)
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/conf.h>
#endif
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 0eb8707..869111f 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
- * $Id: npx.c,v 1.59 1998/04/15 18:58:09 bde Exp $
+ * $Id: npx.c,v 1.60 1998/04/19 15:39:26 bde Exp $
*/
#include "npx.h"
@@ -46,7 +46,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/sysctl.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#ifdef NPX_DEBUG
#include <sys/syslog.h>
diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c
index 939f037..3d962e7 100644
--- a/sys/i386/isa/seagate.c
+++ b/sys/i386/isa/seagate.c
@@ -60,7 +60,7 @@
* that category, with the possible exception of scanners and
* some of the older MO drives.
*
- * $Id: seagate.c,v 1.27 1997/11/07 09:20:30 phk Exp $
+ * $Id: seagate.c,v 1.28 1998/04/15 17:26:17 bde Exp $
*/
/*
@@ -126,8 +126,6 @@
#include <scsi/scsiconf.h>
-#include "ioconf.h"
-
#ifdef DEBUG
# define PRINT(s) printf s
#else
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 3971fce..8cf5c6d 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: wst.c,v 1.5 1998/06/08 06:18:52 bde Exp $
+ * $Id: wst.c,v 1.6 1998/06/08 09:47:37 bde Exp $
*/
#include "wdc.h"
@@ -39,7 +39,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/mtio.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 8e429e2..bb0867a 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_synch.c 8.9 (Berkeley) 5/19/95
- * $Id: kern_synch.c,v 1.56 1998/05/17 22:12:14 tegge Exp $
+ * $Id: kern_synch.c,v 1.57 1998/05/28 09:30:19 phk Exp $
*/
#include "opt_ktrace.h"
@@ -60,7 +60,6 @@
#ifdef SMP
#include <machine/smp.h>
#endif
-#include <machine/ipl.h>
#include <machine/limits.h> /* for UCHAR_MAX = typeof(p_priority)_MAX */
static void rqinit __P((void *));
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 7a97af3..29518f0 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,14 +36,13 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.155 1998/06/10 18:13:19 julian Exp $
+ * $Id: vfs_subr.c,v 1.156 1998/06/10 22:02:14 julian Exp $
*/
/*
* External virtual filesystem routines
*/
#include "opt_ddb.h"
-#include "opt_devfs.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,9 +70,6 @@
#include <vm/vm_zone.h>
#include <sys/sysctl.h>
-#if defined(DEVFS)
-#include <sys/devfsext.h>
-#endif /* DEVFS */
#include <miscfs/specfs/specdev.h>
static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure");
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 7a97af3..29518f0 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,14 +36,13 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.155 1998/06/10 18:13:19 julian Exp $
+ * $Id: vfs_subr.c,v 1.156 1998/06/10 22:02:14 julian Exp $
*/
/*
* External virtual filesystem routines
*/
#include "opt_ddb.h"
-#include "opt_devfs.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,9 +70,6 @@
#include <vm/vm_zone.h>
#include <sys/sysctl.h>
-#if defined(DEVFS)
-#include <sys/devfsext.h>
-#endif /* DEVFS */
#include <miscfs/specfs/specdev.h>
static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure");
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 3971fce..8cf5c6d 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: wst.c,v 1.5 1998/06/08 06:18:52 bde Exp $
+ * $Id: wst.c,v 1.6 1998/06/08 09:47:37 bde Exp $
*/
#include "wdc.h"
@@ -39,7 +39,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
-#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/mtio.h>
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 3687fe7..c2d8e2d 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -298,7 +298,6 @@
#include <machine/ioctl_meteor.h>
#include <machine/ioctl_bt848.h> /* extensions to ioctl_meteor.h */
#include <pci/brktree_reg.h>
-#include <vm/vm.h>
#include <sys/sysctl.h>
static int bt848_card = -1;
static int bt848_tuner = -1;
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 6bf7e1c..08928b0 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
* from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
*
* @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.77 1998/05/19 07:13:21 peter Exp $
+ * $Id: vm_mmap.c,v 1.78 1998/06/07 17:13:11 dfr Exp $
*/
/*
@@ -60,7 +60,6 @@
#include <sys/conf.h>
#include <sys/stat.h>
#include <sys/vmmeter.h>
-#include <sys/resourcevar.h>
#include <miscfs/specfs/specdev.h>
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 72661f6..ae412e0 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91
- * $Id: vm_page.c,v 1.100 1998/06/02 05:50:08 dyson Exp $
+ * $Id: vm_page.c,v 1.101 1998/06/07 17:13:13 dfr Exp $
*/
/*
@@ -74,7 +74,6 @@
#include <sys/proc.h>
#include <sys/vmmeter.h>
#include <sys/vnode.h>
-#include <sys/kernel.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index b2c5ffd..6c86de2 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_page.h,v 1.39 1998/05/24 04:25:27 dyson Exp $
+ * $Id: vm_page.h,v 1.40 1998/06/07 17:13:14 dfr Exp $
*/
/*
@@ -354,10 +354,6 @@ vm_page_hold(vm_page_t mem)
mem->hold_count++;
}
-#ifdef DIAGNOSTIC
-#include <sys/systm.h> /* make GCC shut up */
-#endif
-
static __inline void
vm_page_unhold(vm_page_t mem)
{
OpenPOWER on IntegriCloud