summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreivind <eivind@FreeBSD.org>1998-02-06 12:14:30 +0000
committereivind <eivind@FreeBSD.org>1998-02-06 12:14:30 +0000
commit4547a09753662d6525ae498b0da796738fa1bb22 (patch)
tree41dc9b04c45389c79e84d3a141cbe7ea5344d493
parent9416651e391c8c68c7e2245cd88c5133818f760f (diff)
downloadFreeBSD-src-4547a09753662d6525ae498b0da796738fa1bb22.zip
FreeBSD-src-4547a09753662d6525ae498b0da796738fa1bb22.tar.gz
Back out DIAGNOSTIC changes.
-rw-r--r--sys/alpha/linux/linux_sysvec.c4
-rw-r--r--sys/amd64/amd64/busdma_machdep.c4
-rw-r--r--sys/amd64/amd64/cpu_switch.S3
-rw-r--r--sys/amd64/amd64/machdep.c3
-rw-r--r--sys/amd64/amd64/pmap.c3
-rw-r--r--sys/amd64/amd64/swtch.s3
-rw-r--r--sys/amd64/amd64/trap.c3
-rw-r--r--sys/amd64/amd64/vm_machdep.c3
-rw-r--r--sys/amd64/isa/isa.c4
-rw-r--r--sys/dev/bktr/bktr_core.c1
-rw-r--r--sys/dev/de/if_de.c3
-rw-r--r--sys/dev/ed/if_ed.c3
-rw-r--r--sys/dev/ep/if_ep.c3
-rw-r--r--sys/dev/lnc/if_lnc.c1
-rw-r--r--sys/dev/snp/snp.c1
-rw-r--r--sys/fs/cd9660/cd9660_node.c4
-rw-r--r--sys/fs/fifofs/fifo_vnops.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_denode.c4
-rw-r--r--sys/fs/msdosfs/msdosfs_fat.c7
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c4
-rw-r--r--sys/fs/nullfs/null_subr.c3
-rw-r--r--sys/fs/nullfs/null_vfsops.c3
-rw-r--r--sys/fs/procfs/procfs_map.c4
-rw-r--r--sys/fs/procfs/procfs_mem.c4
-rw-r--r--sys/fs/procfs/procfs_vnops.c4
-rw-r--r--sys/fs/specfs/spec_vnops.c4
-rw-r--r--sys/fs/unionfs/union_subr.c4
-rw-r--r--sys/fs/unionfs/union_vfsops.c4
-rw-r--r--sys/fs/unionfs/union_vnops.c4
-rw-r--r--sys/gnu/ext2fs/ext2_alloc.c1
-rw-r--r--sys/gnu/ext2fs/ext2_balloc.c2
-rw-r--r--sys/gnu/ext2fs/ext2_bmap.c4
-rw-r--r--sys/gnu/ext2fs/ext2_ihash.c4
-rw-r--r--sys/gnu/ext2fs/ext2_inode.c1
-rw-r--r--sys/gnu/ext2fs/ext2_lookup.c2
-rw-r--r--sys/gnu/ext2fs/ext2_subr.c2
-rw-r--r--sys/gnu/ext2fs/ext2_vnops.c1
-rw-r--r--sys/gnu/fs/ext2fs/ext2_alloc.c1
-rw-r--r--sys/gnu/fs/ext2fs/ext2_balloc.c2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_bmap.c4
-rw-r--r--sys/gnu/fs/ext2fs/ext2_inode.c1
-rw-r--r--sys/gnu/fs/ext2fs/ext2_lookup.c2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_subr.c2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vnops.c1
-rw-r--r--sys/i386/i386/busdma_machdep.c4
-rw-r--r--sys/i386/i386/machdep.c3
-rw-r--r--sys/i386/i386/pmap.c3
-rw-r--r--sys/i386/i386/swtch.s3
-rw-r--r--sys/i386/i386/trap.c3
-rw-r--r--sys/i386/i386/vm86.c3
-rw-r--r--sys/i386/i386/vm_machdep.c3
-rw-r--r--sys/i386/ibcs2/ibcs2_sysi86.c2
-rw-r--r--sys/i386/isa/aha1542.c3
-rw-r--r--sys/i386/isa/if_ed.c3
-rw-r--r--sys/i386/isa/if_ep.c3
-rw-r--r--sys/i386/isa/if_lnc.c1
-rw-r--r--sys/i386/isa/isa.c4
-rw-r--r--sys/i386/isa/pcvt/pcvt_sup.c2
-rw-r--r--sys/i386/linux/linux_sysvec.c4
-rw-r--r--sys/isofs/cd9660/cd9660_node.c4
-rw-r--r--sys/kern/init_main.c3
-rw-r--r--sys/kern/kern_clock.c4
-rw-r--r--sys/kern/kern_descrip.c3
-rw-r--r--sys/kern/kern_exec.c4
-rw-r--r--sys/kern/kern_lock.c4
-rw-r--r--sys/kern/kern_malloc.c4
-rw-r--r--sys/kern/kern_proc.c4
-rw-r--r--sys/kern/kern_sig.c3
-rw-r--r--sys/kern/kern_subr.c4
-rw-r--r--sys/kern/kern_synch.c3
-rw-r--r--sys/kern/kern_tc.c4
-rw-r--r--sys/kern/subr_rlist.c4
-rw-r--r--sys/kern/subr_trap.c3
-rw-r--r--sys/kern/sys_pipe.c4
-rw-r--r--sys/kern/sys_process.c4
-rw-r--r--sys/kern/tty_snoop.c1
-rw-r--r--sys/kern/uipc_socket.c4
-rw-r--r--sys/kern/uipc_usrreq.c4
-rw-r--r--sys/kern/vfs_aio.c4
-rw-r--r--sys/kern/vfs_bio.c3
-rw-r--r--sys/kern/vfs_cluster.c3
-rw-r--r--sys/kern/vfs_export.c3
-rw-r--r--sys/kern/vfs_extattr.c5
-rw-r--r--sys/kern/vfs_lookup.c3
-rw-r--r--sys/kern/vfs_subr.c3
-rw-r--r--sys/kern/vfs_syscalls.c5
-rw-r--r--sys/kern/vfs_vnops.c4
-rw-r--r--sys/miscfs/fifofs/fifo_vnops.c4
-rw-r--r--sys/miscfs/nullfs/null_subr.c3
-rw-r--r--sys/miscfs/nullfs/null_vfsops.c3
-rw-r--r--sys/miscfs/procfs/procfs_map.c4
-rw-r--r--sys/miscfs/procfs/procfs_mem.c4
-rw-r--r--sys/miscfs/procfs/procfs_vnops.c4
-rw-r--r--sys/miscfs/specfs/spec_vnops.c4
-rw-r--r--sys/miscfs/union/union_subr.c4
-rw-r--r--sys/miscfs/union/union_vfsops.c4
-rw-r--r--sys/miscfs/union/union_vnops.c4
-rw-r--r--sys/msdosfs/msdosfs_denode.c4
-rw-r--r--sys/msdosfs/msdosfs_fat.c7
-rw-r--r--sys/msdosfs/msdosfs_vnops.c4
-rw-r--r--sys/net/hostcache.c4
-rw-r--r--sys/net/if_media.c4
-rw-r--r--sys/net/route.c3
-rw-r--r--sys/netinet/if_atm.c1
-rw-r--r--sys/netinet/in_rmx.c4
-rw-r--r--sys/netinet/ip_divert.c3
-rw-r--r--sys/netinet/ip_fw.c3
-rw-r--r--sys/netinet/ip_input.c3
-rw-r--r--sys/netinet/ip_mroute.c3
-rw-r--r--sys/netinet/ip_output.c3
-rw-r--r--sys/netnatm/natm.c2
-rw-r--r--sys/netnatm/natm_pcb.c2
-rw-r--r--sys/nfs/nfs_bio.c3
-rw-r--r--sys/nfs/nfs_common.c5
-rw-r--r--sys/nfs/nfs_serv.c4
-rw-r--r--sys/nfs/nfs_subs.c5
-rw-r--r--sys/nfs/nfs_syscalls.c4
-rw-r--r--sys/nfs/nfs_vnops.c3
-rw-r--r--sys/nfsclient/nfs_bio.c3
-rw-r--r--sys/nfsclient/nfs_nfsiod.c4
-rw-r--r--sys/nfsclient/nfs_subs.c5
-rw-r--r--sys/nfsclient/nfs_vnops.c3
-rw-r--r--sys/nfsserver/nfs_serv.c4
-rw-r--r--sys/nfsserver/nfs_srvsubs.c5
-rw-r--r--sys/nfsserver/nfs_syscalls.c4
-rw-r--r--sys/pc98/i386/machdep.c3
-rw-r--r--sys/pc98/i386/trap.c3
-rw-r--r--sys/pc98/pc98/if_ed.c3
-rw-r--r--sys/pc98/pc98/machdep.c3
-rw-r--r--sys/pc98/pc98/pc98.c4
-rw-r--r--sys/pci/brooktree848.c1
-rw-r--r--sys/pci/ide_pci.c4
-rw-r--r--sys/pci/if_de.c3
-rw-r--r--sys/ufs/ffs/ffs_alloc.c3
-rw-r--r--sys/ufs/ffs/ffs_balloc.c4
-rw-r--r--sys/ufs/ffs/ffs_inode.c3
-rw-r--r--sys/ufs/ffs/ffs_subr.c4
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c3
-rw-r--r--sys/ufs/ffs/ffs_vnops.c4
-rw-r--r--sys/ufs/ufs/ufs_bmap.c4
-rw-r--r--sys/ufs/ufs/ufs_ihash.c4
-rw-r--r--sys/ufs/ufs/ufs_lookup.c4
-rw-r--r--sys/ufs/ufs/ufs_quota.c4
-rw-r--r--sys/ufs/ufs/ufs_vnops.c3
-rw-r--r--sys/vm/default_pager.c4
-rw-r--r--sys/vm/device_pager.c4
-rw-r--r--sys/vm/swap_pager.c4
-rw-r--r--sys/vm/vm_fault.c4
-rw-r--r--sys/vm/vm_glue.c3
-rw-r--r--sys/vm/vm_init.c4
-rw-r--r--sys/vm/vm_kern.c4
-rw-r--r--sys/vm/vm_map.c4
-rw-r--r--sys/vm/vm_mmap.c3
-rw-r--r--sys/vm/vm_object.c4
-rw-r--r--sys/vm/vm_page.c4
-rw-r--r--sys/vm/vm_pageout.c4
-rw-r--r--sys/vm/vm_pager.c4
-rw-r--r--sys/vm/vm_zone.c4
-rw-r--r--sys/vm/vnode_pager.c4
159 files changed, 136 insertions, 400 deletions
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index c051291..3c60ca0 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -25,11 +25,9 @@
* (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: linux_sysvec.c,v 1.21 1997/12/16 17:40:12 eivind Exp $
+ * $Id: linux_sysvec.c,v 1.22 1998/02/04 22:32:28 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index d085d31..1ed1989 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -23,11 +23,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: busdma_machdep.c,v 1.1 1998/01/15 07:32:20 gibbs Exp $
+ * $Id: busdma_machdep.c,v 1.2 1998/02/04 22:32:07 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index eb859e8..74ee53c 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,11 +33,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: swtch.s,v 1.66 1997/12/15 02:18:24 tegge Exp $
+ * $Id: swtch.s,v 1.67 1998/02/04 22:32:11 eivind Exp $
*/
#include "npx.h"
-#include "opt_diagnostic.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index abb61ed..4ea59b1 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.286 1998/02/03 21:27:46 bde Exp $
+ * $Id: machdep.c,v 1.287 1998/02/04 22:32:08 eivind Exp $
*/
#include "apm.h"
@@ -43,7 +43,6 @@
#include "opt_bounce.h"
#include "opt_cpu.h"
#include "opt_ddb.h"
-#include "opt_diagnostic.h"
#include "opt_maxmem.h"
#include "opt_perfmon.h"
#include "opt_smp.h"
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 8a4bf2e..0a2024d 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.181 1998/02/04 22:32:10 eivind Exp $
+ * $Id: pmap.c,v 1.182 1998/02/05 03:31:42 dyson Exp $
*/
/*
@@ -68,7 +68,6 @@
* and to when physical maps must be made correct.
*/
-#include "opt_diagnostic.h"
#include "opt_disable_pse.h"
#include <sys/param.h>
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index eb859e8..74ee53c 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,11 +33,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: swtch.s,v 1.66 1997/12/15 02:18:24 tegge Exp $
+ * $Id: swtch.s,v 1.67 1998/02/04 22:32:11 eivind Exp $
*/
#include "npx.h"
-#include "opt_diagnostic.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 8d7bd9e..79715f5 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.120 1998/01/31 05:00:15 eivind Exp $
+ * $Id: trap.c,v 1.121 1998/02/04 22:32:12 eivind Exp $
*/
/*
@@ -44,7 +44,6 @@
#include "opt_cpu.h"
#include "opt_ddb.h"
-#include "opt_diagnostic.h"
#include "opt_ktrace.h"
#include "opt_trap.h"
#include "opt_vm86.h"
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index be470d6..543e876 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,12 +38,11 @@
*
* 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.97 1998/01/30 10:26:26 dyson Exp $
+ * $Id: vm_machdep.c,v 1.98 1998/02/04 22:32:13 eivind Exp $
*/
#include "npx.h"
#include "opt_bounce.h"
-#include "opt_diagnostic.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index f9a63bf..4c13577 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: isa.c,v 1.109 1998/01/31 03:29:00 eivind Exp $
+ * $Id: isa.c,v 1.110 1998/02/04 22:32:21 eivind Exp $
*/
/*
@@ -47,8 +47,6 @@
* isa_dmastart()
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 35857e6..7f9e838 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -218,7 +218,6 @@
#ifdef __FreeBSD__
#include "bktr.h"
-#include "opt_diagnostic.h"
#include "pci.h"
#endif /* __FreeBSD__ */
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index c9dbc18..c01f608 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $ */
-/* $Id: if_de.c,v 1.77 1998/01/08 23:42:24 eivind Exp $ */
+/* $Id: if_de.c,v 1.78 1998/02/04 22:33:24 eivind Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -39,7 +39,6 @@
*/
#define TULIP_HDR_DATA
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "opt_ipx.h"
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 95c99fd..849ef4e 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.131 1998/02/04 22:32:18 eivind Exp $
+ * $Id: if_ed.c,v 1.132 1998/02/05 04:08:41 eivind Exp $
*/
/*
@@ -39,7 +39,6 @@
#include "ed.h"
#include "bpfilter.h"
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "pnp.h"
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 81d5a60..dbbf8db 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.70 1998/01/08 23:40:50 eivind Exp $
+ * $Id: if_ep.c,v 1.71 1998/02/04 22:32:19 eivind Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@@ -60,7 +60,6 @@
#if NEP > 0
#include "bpfilter.h"
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "opt_ipx.h"
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 4c3e1c8..71d9934 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -65,7 +65,6 @@
#if NLNC > 0
#include "bpfilter.h"
-#include "opt_diagnostic.h"
#include "opt_inet.h"
/* Some defines that should really be in generic locations */
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 40aa418..7bfb635 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -19,7 +19,6 @@
#include "opt_compat.h"
#include "opt_devfs.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 5391eb6..7220d1e 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.22 1997/11/18 14:40:30 phk Exp $
+ * $Id: cd9660_node.c,v 1.23 1998/02/04 22:32:29 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 63686e7..f7e47e1 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.41 1997/12/19 18:58:14 bde Exp $
+ * $Id: fifo_vnops.c,v 1.42 1998/02/04 22:32:45 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/unistd.h>
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index cddd895..4b961f5 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.28 1997/10/12 20:24:59 phk Exp $ */
+/* $Id: msdosfs_denode.c,v 1.29 1998/02/04 22:33:00 eivind Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */
/*-
@@ -48,8 +48,6 @@
* October 1992
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 5a06a38..f3c2f5f 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_fat.c,v 1.13 1997/09/02 20:06:16 bde Exp $ */
+/* $Id: msdosfs_fat.c,v 1.14 1998/02/04 22:33:00 eivind Exp $ */
/* $NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $ */
/*-
@@ -49,11 +49,6 @@
*/
/*
- * Option include files
- */
-#include "opt_diagnostic.h"
-
-/*
* kernel include files.
*/
#include <sys/param.h>
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index d63cbab..3d7b3f7 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.53 1997/12/27 02:56:31 bde Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.54 1998/02/04 22:33:01 eivind Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */
/*-
@@ -48,8 +48,6 @@
* October 1992
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 9932099..de64494 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -35,11 +35,10 @@
*
* @(#)null_subr.c 8.7 (Berkeley) 5/14/95
*
- * $Id: null_subr.c,v 1.14 1998/01/31 07:23:12 eivind Exp $
+ * $Id: null_subr.c,v 1.15 1998/02/04 22:32:46 eivind Exp $
*/
#include "opt_debug_nullfs.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index bfb97d6..30515a5 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.22 1998/01/31 07:23:12 eivind Exp $
+ * $Id: null_vfsops.c,v 1.23 1998/02/04 22:32:47 eivind Exp $
*/
/*
@@ -44,7 +44,6 @@
* (See null_vnops.c for a description of what this does.)
*/
-#include "opt_diagnostic.h"
#include "opt_debug_nullfs.h"
#include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 55d003a..ca62755 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -36,11 +36,9 @@
*
* @(#)procfs_status.c 8.3 (Berkeley) 2/17/94
*
- * $Id: procfs_map.c,v 1.14 1998/01/06 05:19:54 dyson Exp $
+ * $Id: procfs_map.c,v 1.15 1998/02/04 22:32:48 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 009476d..5625678 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.28 1998/01/22 17:30:01 dyson Exp $
+ * $Id: procfs_mem.c,v 1.29 1998/02/04 22:32:49 eivind Exp $
*/
/*
@@ -45,8 +45,6 @@
* of sef's pread/pwrite functions
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 85fd031..932b6c1 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,15 +36,13 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
- * $Id: procfs_vnops.c,v 1.52 1998/01/06 05:19:58 dyson Exp $
+ * $Id: procfs_vnops.c,v 1.53 1998/02/04 22:32:49 eivind Exp $
*/
/*
* procfs vnode interface
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/time.h>
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index ebeea74..ff2bc6a 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.54 1998/02/04 22:32:51 eivind Exp $
+ * $Id: spec_vnops.c,v 1.55 1998/02/05 03:32:23 dyson Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/systm.h>
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index cddfcaa..f7f82c2 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,11 +35,9 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.25 1998/01/25 09:44:33 kato Exp $
+ * $Id: union_subr.c,v 1.26 1998/02/04 22:32:52 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/vnode.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index e4094dd..eeb1972 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,15 +35,13 @@
* SUCH DAMAGE.
*
* @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.23 1998/01/18 07:56:41 kato Exp $
+ * $Id: union_vfsops.c,v 1.24 1998/02/04 22:32:53 eivind Exp $
*/
/*
* Union Layer
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index ca415f0..fc485f3 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,11 +35,9 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.51 1998/02/04 22:32:55 eivind Exp $
+ * $Id: union_vnops.c,v 1.52 1998/02/06 02:42:21 kato Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index 541aa2d..cfd4ac9 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -39,7 +39,6 @@
* @(#)ext2_alloc.c 8.8 (Berkeley) 2/21/94
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_balloc.c b/sys/gnu/ext2fs/ext2_balloc.c
index f7ea491..3d87123 100644
--- a/sys/gnu/ext2fs/ext2_balloc.c
+++ b/sys/gnu/ext2fs/ext2_balloc.c
@@ -39,8 +39,6 @@
* @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index b4af4bf..6b7d289 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.18 1998/01/24 02:01:41 dyson Exp $
+ * $Id: ufs_bmap.c,v 1.19 1998/02/04 22:33:35 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index 8729f62..56be3fd 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.13 1997/12/05 19:55:51 bde Exp $
+ * $Id: ufs_ihash.c,v 1.14 1998/02/04 22:33:35 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c
index 07f81b0..5231fec 100644
--- a/sys/gnu/ext2fs/ext2_inode.c
+++ b/sys/gnu/ext2fs/ext2_inode.c
@@ -39,7 +39,6 @@
* @(#)ext2_inode.c 8.5 (Berkeley) 12/30/93
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index e4d9fef..dc70c76 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -44,8 +44,6 @@
* @(#)ufs_lookup.c 8.6 (Berkeley) 4/1/94
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index 462f727..a70e445 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -39,8 +39,6 @@
* @(#)ext2_subr.c 8.2 (Berkeley) 9/21/93
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <gnu/ext2fs/ext2_fs_sb.h>
#include <gnu/ext2fs/fs.h>
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index 3c74684..91a89c9 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -45,7 +45,6 @@
* @(#)ext2_vnops.c 8.7 (Berkeley) 2/3/94
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include "opt_suiddir.h"
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index 541aa2d..cfd4ac9 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -39,7 +39,6 @@
* @(#)ext2_alloc.c 8.8 (Berkeley) 2/21/94
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_balloc.c b/sys/gnu/fs/ext2fs/ext2_balloc.c
index f7ea491..3d87123 100644
--- a/sys/gnu/fs/ext2fs/ext2_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_balloc.c
@@ -39,8 +39,6 @@
* @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index b4af4bf..6b7d289 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.18 1998/01/24 02:01:41 dyson Exp $
+ * $Id: ufs_bmap.c,v 1.19 1998/02/04 22:33:35 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c
index 07f81b0..5231fec 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode.c
@@ -39,7 +39,6 @@
* @(#)ext2_inode.c 8.5 (Berkeley) 12/30/93
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index e4d9fef..dc70c76 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -44,8 +44,6 @@
* @(#)ufs_lookup.c 8.6 (Berkeley) 4/1/94
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index 462f727..a70e445 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -39,8 +39,6 @@
* @(#)ext2_subr.c 8.2 (Berkeley) 9/21/93
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <gnu/ext2fs/ext2_fs_sb.h>
#include <gnu/ext2fs/fs.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 3c74684..91a89c9 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -45,7 +45,6 @@
* @(#)ext2_vnops.c 8.7 (Berkeley) 2/3/94
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include "opt_suiddir.h"
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index d085d31..1ed1989 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -23,11 +23,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: busdma_machdep.c,v 1.1 1998/01/15 07:32:20 gibbs Exp $
+ * $Id: busdma_machdep.c,v 1.2 1998/02/04 22:32:07 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index abb61ed..4ea59b1 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.286 1998/02/03 21:27:46 bde Exp $
+ * $Id: machdep.c,v 1.287 1998/02/04 22:32:08 eivind Exp $
*/
#include "apm.h"
@@ -43,7 +43,6 @@
#include "opt_bounce.h"
#include "opt_cpu.h"
#include "opt_ddb.h"
-#include "opt_diagnostic.h"
#include "opt_maxmem.h"
#include "opt_perfmon.h"
#include "opt_smp.h"
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 8a4bf2e..0a2024d 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
- * $Id: pmap.c,v 1.181 1998/02/04 22:32:10 eivind Exp $
+ * $Id: pmap.c,v 1.182 1998/02/05 03:31:42 dyson Exp $
*/
/*
@@ -68,7 +68,6 @@
* and to when physical maps must be made correct.
*/
-#include "opt_diagnostic.h"
#include "opt_disable_pse.h"
#include <sys/param.h>
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index eb859e8..74ee53c 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,11 +33,10 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: swtch.s,v 1.66 1997/12/15 02:18:24 tegge Exp $
+ * $Id: swtch.s,v 1.67 1998/02/04 22:32:11 eivind Exp $
*/
#include "npx.h"
-#include "opt_diagnostic.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 8d7bd9e..79715f5 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.120 1998/01/31 05:00:15 eivind Exp $
+ * $Id: trap.c,v 1.121 1998/02/04 22:32:12 eivind Exp $
*/
/*
@@ -44,7 +44,6 @@
#include "opt_cpu.h"
#include "opt_ddb.h"
-#include "opt_diagnostic.h"
#include "opt_ktrace.h"
#include "opt_trap.h"
#include "opt_vm86.h"
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index 3698c56..c3e463c 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -23,10 +23,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vm86.c,v 1.6 1998/02/03 21:27:47 bde Exp $
+ * $Id: vm86.c,v 1.7 1998/02/04 22:32:12 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_vm86.h"
#include <sys/param.h>
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index be470d6..543e876 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,12 +38,11 @@
*
* 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.97 1998/01/30 10:26:26 dyson Exp $
+ * $Id: vm_machdep.c,v 1.98 1998/02/04 22:32:13 eivind Exp $
*/
#include "npx.h"
#include "opt_bounce.h"
-#include "opt_diagnostic.h"
#include "opt_user_ldt.h"
#include "opt_vm86.h"
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index 5af6f1c..ba9c12f 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.c
@@ -29,8 +29,6 @@
* ibcs2_sysi86.c,v 1.1 1994/10/14 08:53:11 sos Exp
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysctl.h>
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index f818aad..bd01c6e 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
- * $Id: aha1542.c,v 1.72 1997/11/18 10:56:41 bde Exp $
+ * $Id: aha1542.c,v 1.73 1998/02/04 22:32:16 eivind Exp $
*/
/*
@@ -20,7 +20,6 @@
*/
#include "aha.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 95c99fd..849ef4e 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.131 1998/02/04 22:32:18 eivind Exp $
+ * $Id: if_ed.c,v 1.132 1998/02/05 04:08:41 eivind Exp $
*/
/*
@@ -39,7 +39,6 @@
#include "ed.h"
#include "bpfilter.h"
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "pnp.h"
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index 81d5a60..dbbf8db 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.70 1998/01/08 23:40:50 eivind Exp $
+ * $Id: if_ep.c,v 1.71 1998/02/04 22:32:19 eivind Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@@ -60,7 +60,6 @@
#if NEP > 0
#include "bpfilter.h"
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "opt_ipx.h"
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 4c3e1c8..71d9934 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -65,7 +65,6 @@
#if NLNC > 0
#include "bpfilter.h"
-#include "opt_diagnostic.h"
#include "opt_inet.h"
/* Some defines that should really be in generic locations */
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index f9a63bf..4c13577 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: isa.c,v 1.109 1998/01/31 03:29:00 eivind Exp $
+ * $Id: isa.c,v 1.110 1998/02/04 22:32:21 eivind Exp $
*/
/*
@@ -47,8 +47,6 @@
* isa_dmastart()
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index 5a551cf..d34c01b 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -64,8 +64,6 @@
#include "vt.h"
#if NVT > 0
-#include "opt_diagnostic.h"
-
#include <i386/isa/pcvt/pcvt_hdr.h> /* global include */
static void vid_cursor ( struct cursorshape *data );
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index c051291..3c60ca0 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,11 +25,9 @@
* (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: linux_sysvec.c,v 1.21 1997/12/16 17:40:12 eivind Exp $
+ * $Id: linux_sysvec.c,v 1.22 1998/02/04 22:32:28 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 5391eb6..7220d1e 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.22 1997/11/18 14:40:30 phk Exp $
+ * $Id: cd9660_node.c,v 1.23 1998/02/04 22:32:29 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index db6df3a..74b3bf9 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,11 +39,10 @@
* SUCH DAMAGE.
*
* @(#)init_main.c 8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.81 1998/01/30 11:32:52 phk Exp $
+ * $Id: init_main.c,v 1.82 1998/02/04 22:32:30 eivind Exp $
*/
#include "opt_devfs.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/file.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index f33268d..4952704 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.53 1998/01/14 20:48:15 phk Exp $
+ * $Id: kern_clock.c,v 1.54 1998/02/04 22:32:30 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/dkstat.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index aaeee72..2918c3c25 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,11 +36,10 @@
* SUCH DAMAGE.
*
* @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.48 1998/01/24 02:54:34 eivind Exp $
+ * $Id: kern_descrip.c,v 1.49 1998/02/04 22:32:31 eivind Exp $
*/
#include "opt_compat.h"
-#include "opt_diagnostic.h"
#include "opt_devfs.h"
#include <sys/param.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 4d40448..9ef254e 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,11 +23,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: kern_exec.c,v 1.75 1998/02/04 22:32:31 eivind Exp $
+ * $Id: kern_exec.c,v 1.76 1998/02/05 03:32:04 dyson Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 8db4a6b..ea3e8fc 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -38,11 +38,9 @@
* SUCH DAMAGE.
*
* @(#)kern_lock.c 8.18 (Berkeley) 5/21/95
- * $Id: kern_lock.c,v 1.14 1997/11/07 08:52:55 phk Exp $
+ * $Id: kern_lock.c,v 1.15 1998/02/04 22:32:32 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/lock.h>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index bba797f..d0fa6e4 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.40 1998/02/04 22:32:32 eivind Exp $
+ * $Id: kern_malloc.c,v 1.41 1998/02/05 03:32:06 dyson Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index fb6373b..63b193d 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)kern_proc.c 8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.32 1998/02/02 05:14:03 dyson Exp $
+ * $Id: kern_proc.c,v 1.33 1998/02/04 22:32:33 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 1b6e093..0cb6f39 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,11 +36,10 @@
* SUCH DAMAGE.
*
* @(#)kern_sig.c 8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.37 1997/12/16 17:40:17 eivind Exp $
+ * $Id: kern_sig.c,v 1.38 1998/02/04 22:32:33 eivind Exp $
*/
#include "opt_compat.h"
-#include "opt_diagnostic.h"
#include "opt_ktrace.h"
#define SIGPROP /* include signal properties table */
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 7037a2d..1f2f28b 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)kern_subr.c 8.3 (Berkeley) 1/21/94
- * $Id: kern_subr.c,v 1.17 1998/02/04 22:32:34 eivind Exp $
+ * $Id: kern_subr.c,v 1.18 1998/02/05 03:32:07 dyson Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 5ac7276..17f77a6 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,10 +36,9 @@
* SUCH DAMAGE.
*
* @(#)kern_synch.c 8.9 (Berkeley) 5/19/95
- * $Id: kern_synch.c,v 1.44 1997/12/29 08:54:52 bde Exp $
+ * $Id: kern_synch.c,v 1.45 1998/02/04 22:32:34 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_ktrace.h"
#include <sys/param.h>
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index f33268d..4952704 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.53 1998/01/14 20:48:15 phk Exp $
+ * $Id: kern_clock.c,v 1.54 1998/02/04 22:32:30 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/dkstat.h>
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index e7011a5..17b4055 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,11 +54,9 @@
* functioning of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
- * $Id: subr_rlist.c,v 1.23 1997/09/16 11:43:31 bde Exp $
+ * $Id: subr_rlist.c,v 1.24 1998/02/04 22:32:35 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/rlist.h>
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 8d7bd9e..79715f5 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.120 1998/01/31 05:00:15 eivind Exp $
+ * $Id: trap.c,v 1.121 1998/02/04 22:32:12 eivind Exp $
*/
/*
@@ -44,7 +44,6 @@
#include "opt_cpu.h"
#include "opt_ddb.h"
-#include "opt_diagnostic.h"
#include "opt_ktrace.h"
#include "opt_trap.h"
#include "opt_vm86.h"
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index b868ba5..3565e95 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.36 1997/11/07 08:53:00 phk Exp $
+ * $Id: sys_pipe.c,v 1.37 1998/02/04 22:32:35 eivind Exp $
*/
/*
@@ -49,8 +49,6 @@
* amount of kernel virtual memory.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index b1ee84d..fcfbb7c 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,11 +28,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: sys_process.c,v 1.34 1998/01/22 17:29:49 dyson Exp $
+ * $Id: sys_process.c,v 1.35 1998/02/04 22:32:36 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 40aa418..7bfb635 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -19,7 +19,6 @@
#include "opt_compat.h"
#include "opt_devfs.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 4289d0e..f34f9b6 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94
- * $Id: uipc_socket.c,v 1.34 1997/11/09 05:07:40 jkh Exp $
+ * $Id: uipc_socket.c,v 1.35 1998/02/04 22:32:37 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 8d2f928..dfd04d6 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94
- * $Id: uipc_usrreq.c,v 1.30 1997/11/23 10:43:49 bde Exp $
+ * $Id: uipc_usrreq.c,v 1.31 1998/02/04 22:32:37 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 36570ed..802b069 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,15 +13,13 @@
* 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.20 1997/12/10 04:14:23 dyson Exp $
+ * $Id: vfs_aio.c,v 1.21 1998/02/04 22:32:38 eivind Exp $
*/
/*
* This file contains support for the POSIX.4 AIO/LIO facility.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 426c3ba..c03a8f8 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
* 2. Absolutely no warranty of function or purpose is made by the author
* John S. Dyson.
*
- * $Id: vfs_bio.c,v 1.147 1998/01/31 11:55:59 dyson Exp $
+ * $Id: vfs_bio.c,v 1.148 1998/02/04 22:32:39 eivind Exp $
*/
/*
@@ -26,7 +26,6 @@
*/
#include "opt_bounce.h"
-#include "opt_diagnostic.h"
#define VMIO
#include <sys/param.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 02d7610..220f760 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,11 +33,10 @@
* SUCH DAMAGE.
*
* @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.53 1998/01/31 11:56:01 dyson Exp $
+ * $Id: vfs_cluster.c,v 1.54 1998/02/04 22:32:39 eivind Exp $
*/
#include "opt_debug_cluster.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 08b65bc..478a5c6 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.128 1998/02/04 22:32:40 eivind Exp $
+ * $Id: vfs_subr.c,v 1.129 1998/02/05 03:32:11 dyson Exp $
*/
/*
@@ -44,7 +44,6 @@
*/
#include "opt_ddb.h"
#include "opt_devfs.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index d59a335..7d875bb 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,15 +36,12 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.89 1998/01/06 05:16:26 dyson Exp $
+ * $Id: vfs_syscalls.c,v 1.90 1998/02/04 22:32:41 eivind Exp $
*/
/* For 4.3 integer FS ID compatibility */
#include "opt_compat.h"
-/* For diagnostic support */
-#include "opt_diagnostic.h"
-
/*
* XXX - The following is required because of some magic done
* in getdirentries() below which is only done if the translucent
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index a1b0616..d3934b3 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,10 +36,9 @@
* SUCH DAMAGE.
*
* @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.23 1998/01/06 05:16:09 dyson Exp $
+ * $Id: vfs_lookup.c,v 1.24 1998/02/04 22:32:40 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_ktrace.h"
#include <sys/param.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 08b65bc..478a5c6 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.128 1998/02/04 22:32:40 eivind Exp $
+ * $Id: vfs_subr.c,v 1.129 1998/02/05 03:32:11 dyson Exp $
*/
/*
@@ -44,7 +44,6 @@
*/
#include "opt_ddb.h"
#include "opt_devfs.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index d59a335..7d875bb 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,15 +36,12 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.89 1998/01/06 05:16:26 dyson Exp $
+ * $Id: vfs_syscalls.c,v 1.90 1998/02/04 22:32:41 eivind Exp $
*/
/* For 4.3 integer FS ID compatibility */
#include "opt_compat.h"
-/* For diagnostic support */
-#include "opt_diagnostic.h"
-
/*
* XXX - The following is required because of some magic done
* in getdirentries() below which is only done if the translucent
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 3a4a514..0183821 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.47 1998/01/12 01:46:33 dyson Exp $
+ * $Id: vfs_vnops.c,v 1.48 1998/02/04 22:32:42 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 63686e7..f7e47e1 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.41 1997/12/19 18:58:14 bde Exp $
+ * $Id: fifo_vnops.c,v 1.42 1998/02/04 22:32:45 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/unistd.h>
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index 9932099..de64494 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,11 +35,10 @@
*
* @(#)null_subr.c 8.7 (Berkeley) 5/14/95
*
- * $Id: null_subr.c,v 1.14 1998/01/31 07:23:12 eivind Exp $
+ * $Id: null_subr.c,v 1.15 1998/02/04 22:32:46 eivind Exp $
*/
#include "opt_debug_nullfs.h"
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index bfb97d6..30515a5 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.22 1998/01/31 07:23:12 eivind Exp $
+ * $Id: null_vfsops.c,v 1.23 1998/02/04 22:32:47 eivind Exp $
*/
/*
@@ -44,7 +44,6 @@
* (See null_vnops.c for a description of what this does.)
*/
-#include "opt_diagnostic.h"
#include "opt_debug_nullfs.h"
#include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c
index 55d003a..ca62755 100644
--- a/sys/miscfs/procfs/procfs_map.c
+++ b/sys/miscfs/procfs/procfs_map.c
@@ -36,11 +36,9 @@
*
* @(#)procfs_status.c 8.3 (Berkeley) 2/17/94
*
- * $Id: procfs_map.c,v 1.14 1998/01/06 05:19:54 dyson Exp $
+ * $Id: procfs_map.c,v 1.15 1998/02/04 22:32:48 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index 009476d..5625678 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.28 1998/01/22 17:30:01 dyson Exp $
+ * $Id: procfs_mem.c,v 1.29 1998/02/04 22:32:49 eivind Exp $
*/
/*
@@ -45,8 +45,6 @@
* of sef's pread/pwrite functions
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 85fd031..932b6c1 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,15 +36,13 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
- * $Id: procfs_vnops.c,v 1.52 1998/01/06 05:19:58 dyson Exp $
+ * $Id: procfs_vnops.c,v 1.53 1998/02/04 22:32:49 eivind Exp $
*/
/*
* procfs vnode interface
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/time.h>
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index ebeea74..ff2bc6a 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.54 1998/02/04 22:32:51 eivind Exp $
+ * $Id: spec_vnops.c,v 1.55 1998/02/05 03:32:23 dyson Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/systm.h>
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index cddfcaa..f7f82c2 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,11 +35,9 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.25 1998/01/25 09:44:33 kato Exp $
+ * $Id: union_subr.c,v 1.26 1998/02/04 22:32:52 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/vnode.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index e4094dd..eeb1972 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,15 +35,13 @@
* SUCH DAMAGE.
*
* @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.23 1998/01/18 07:56:41 kato Exp $
+ * $Id: union_vfsops.c,v 1.24 1998/02/04 22:32:53 eivind Exp $
*/
/*
* Union Layer
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index ca415f0..fc485f3 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,11 +35,9 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.51 1998/02/04 22:32:55 eivind Exp $
+ * $Id: union_vnops.c,v 1.52 1998/02/06 02:42:21 kato Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index cddd895..4b961f5 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_denode.c,v 1.28 1997/10/12 20:24:59 phk Exp $ */
+/* $Id: msdosfs_denode.c,v 1.29 1998/02/04 22:33:00 eivind Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */
/*-
@@ -48,8 +48,6 @@
* October 1992
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mount.h>
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index 5a06a38..f3c2f5f 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_fat.c,v 1.13 1997/09/02 20:06:16 bde Exp $ */
+/* $Id: msdosfs_fat.c,v 1.14 1998/02/04 22:33:00 eivind Exp $ */
/* $NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $ */
/*-
@@ -49,11 +49,6 @@
*/
/*
- * Option include files
- */
-#include "opt_diagnostic.h"
-
-/*
* kernel include files.
*/
#include <sys/param.h>
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index d63cbab..3d7b3f7 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.53 1997/12/27 02:56:31 bde Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.54 1998/02/04 22:33:01 eivind Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */
/*-
@@ -48,8 +48,6 @@
* October 1992
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
diff --git a/sys/net/hostcache.c b/sys/net/hostcache.c
index b516b14..74b3916 100644
--- a/sys/net/hostcache.c
+++ b/sys/net/hostcache.c
@@ -26,11 +26,9 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: hostcache.c,v 1.3 1997/11/07 08:53:17 phk Exp $
+ * $Id: hostcache.c,v 1.4 1998/02/04 22:33:02 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 6990aac..51e6df8 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: if_media.c,v 1.3 1997/08/02 14:32:38 bde Exp $ */
+/* $Id: if_media.c,v 1.4 1998/02/04 22:33:03 eivind Exp $ */
/*
* Copyright (c) 1997
@@ -46,8 +46,6 @@
* to implement this interface.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/socket.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index 1bc6bdd..f3e7b04 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,10 +31,9 @@
* SUCH DAMAGE.
*
* @(#)route.c 8.2 (Berkeley) 11/15/93
- * $Id: route.c,v 1.46 1998/01/08 23:41:35 eivind Exp $
+ * $Id: route.c,v 1.47 1998/02/04 22:33:03 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "opt_mrouting.h"
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index 1db865a..1c60ef0 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -36,7 +36,6 @@
* IP <=> ATM address resolution.
*/
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "opt_natm.h"
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 231581c..a215169 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.30 1997/08/02 14:32:50 bde Exp $
+ * $Id: in_rmx.c,v 1.31 1998/02/04 22:33:05 eivind Exp $
*/
/*
@@ -42,8 +42,6 @@
* indefinitely. See in_rtqtimo() below for the exact mechanism.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 6828b3f..dc9b049 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,10 +30,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ip_divert.c,v 1.18 1998/01/27 09:15:06 davidg Exp $
+ * $Id: ip_divert.c,v 1.19 1998/02/04 22:33:06 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#ifndef INET
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index d556860..86b6368 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.74 1998/02/04 22:33:07 eivind Exp $
+ * $Id: ip_fw.c,v 1.75 1998/02/06 02:45:54 alex Exp $
*/
/*
@@ -20,7 +20,6 @@
*/
#ifndef IPFIREWALL_MODULE
-#include "opt_diagnostic.h"
#include "opt_ipfw.h"
#include "opt_ipdivert.h"
#include "opt_inet.h"
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 456d7be..5923d4e 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,14 +31,13 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.73 1998/01/09 03:21:04 eivind Exp $
+ * $Id: ip_input.c,v 1.74 1998/02/04 22:33:08 eivind Exp $
* $ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
*/
#define _IP_VHL
#include "opt_bootp.h"
-#include "opt_diagnostic.h"
#include "opt_ipfw.h"
#include "opt_ipdivert.h"
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 0885dc2..b8068d3 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,10 +9,9 @@
* Modified by Bill Fenner, PARC, April 1995
*
* MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.42 1997/10/28 15:58:50 bde Exp $
+ * $Id: ip_mroute.c,v 1.43 1998/02/04 22:33:08 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_mrouting.h"
#include <sys/param.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 317b4d1..ef77921 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,12 +31,11 @@
* SUCH DAMAGE.
*
* @(#)ip_output.c 8.3 (Berkeley) 1/21/94
- * $Id: ip_output.c,v 1.62 1997/11/07 09:20:45 phk Exp $
+ * $Id: ip_output.c,v 1.63 1998/02/04 22:33:09 eivind Exp $
*/
#define _IP_VHL
-#include "opt_diagnostic.h"
#include "opt_ipdivert.h"
#include <sys/param.h>
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index 8dffe9e..877ed62 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -36,8 +36,6 @@
* natm.c: native mode ATM access (both aal0 and aal5).
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index f37f2f0..16e3a34 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -37,8 +37,6 @@
* from trying to use each other's VCs.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index add9da4..04d8288 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,10 +34,9 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.48 1998/01/31 01:27:18 tegge Exp $
+ * $Id: nfs_bio.c,v 1.49 1998/02/04 22:33:13 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 6e62e8f..b75dd93 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.49 1997/12/27 02:56:35 bde Exp $
+ * $Id: nfs_subs.c,v 1.50 1998/02/04 22:33:15 eivind Exp $
*/
/*
@@ -42,9 +42,6 @@
* the nfs op functions. They do things like create the rpc header and
* copy data between mbuf chains and uio lists.
*/
-
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/proc.h>
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 8f8b06c..e24be24 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.55 1998/01/31 11:56:14 dyson Exp $
+ * $Id: nfs_serv.c,v 1.56 1998/02/04 22:33:14 eivind Exp $
*/
/*
@@ -57,8 +57,6 @@
* most version 3 rpcs return more than the status for error cases.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 6e62e8f..b75dd93 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.49 1997/12/27 02:56:35 bde Exp $
+ * $Id: nfs_subs.c,v 1.50 1998/02/04 22:33:15 eivind Exp $
*/
/*
@@ -42,9 +42,6 @@
* the nfs op functions. They do things like create the rpc header and
* copy data between mbuf chains and uio lists.
*/
-
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/proc.h>
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 9f5ba2a..51fdeb8 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,11 +34,9 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.33 1997/11/24 14:18:00 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.34 1998/02/04 22:33:16 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 4a3fad7..ae49c58 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.76 1998/01/25 06:14:26 dyson Exp $
+ * $Id: nfs_vnops.c,v 1.77 1998/02/04 22:33:17 eivind Exp $
*/
@@ -42,7 +42,6 @@
* vnode op calls for Sun NFS version 2 and 3
*/
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include <sys/param.h>
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index add9da4..04d8288 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,10 +34,9 @@
* SUCH DAMAGE.
*
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.48 1998/01/31 01:27:18 tegge Exp $
+ * $Id: nfs_bio.c,v 1.49 1998/02/04 22:33:13 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 9f5ba2a..51fdeb8 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,11 +34,9 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.33 1997/11/24 14:18:00 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.34 1998/02/04 22:33:16 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 6e62e8f..b75dd93 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.49 1997/12/27 02:56:35 bde Exp $
+ * $Id: nfs_subs.c,v 1.50 1998/02/04 22:33:15 eivind Exp $
*/
/*
@@ -42,9 +42,6 @@
* the nfs op functions. They do things like create the rpc header and
* copy data between mbuf chains and uio lists.
*/
-
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/proc.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 4a3fad7..ae49c58 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.76 1998/01/25 06:14:26 dyson Exp $
+ * $Id: nfs_vnops.c,v 1.77 1998/02/04 22:33:17 eivind Exp $
*/
@@ -42,7 +42,6 @@
* vnode op calls for Sun NFS version 2 and 3
*/
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include <sys/param.h>
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 8f8b06c..e24be24 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.55 1998/01/31 11:56:14 dyson Exp $
+ * $Id: nfs_serv.c,v 1.56 1998/02/04 22:33:14 eivind Exp $
*/
/*
@@ -57,8 +57,6 @@
* most version 3 rpcs return more than the status for error cases.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 6e62e8f..b75dd93 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.49 1997/12/27 02:56:35 bde Exp $
+ * $Id: nfs_subs.c,v 1.50 1998/02/04 22:33:15 eivind Exp $
*/
/*
@@ -42,9 +42,6 @@
* the nfs op functions. They do things like create the rpc header and
* copy data between mbuf chains and uio lists.
*/
-
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/proc.h>
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 9f5ba2a..51fdeb8 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,11 +34,9 @@
* SUCH DAMAGE.
*
* @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.33 1997/11/24 14:18:00 bde Exp $
+ * $Id: nfs_syscalls.c,v 1.34 1998/02/04 22:33:16 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sysproto.h>
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index a80fee7..d4ac0e8 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.74 1998/02/04 10:19:33 kato Exp $
+ * $Id: machdep.c,v 1.75 1998/02/05 10:05:43 kato Exp $
*/
#include "apm.h"
@@ -43,7 +43,6 @@
#include "opt_bounce.h"
#include "opt_cpu.h"
#include "opt_ddb.h"
-#include "opt_diagnostic.h"
#include "opt_maxmem.h"
#include "opt_perfmon.h"
#include "opt_smp.h"
diff --git a/sys/pc98/i386/trap.c b/sys/pc98/i386/trap.c
index f3c9a3a..2836f1c 100644
--- a/sys/pc98/i386/trap.c
+++ b/sys/pc98/i386/trap.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.43 1998/01/31 15:16:27 kato Exp $
+ * $Id: trap.c,v 1.44 1998/02/05 10:05:47 kato Exp $
*/
/*
@@ -44,7 +44,6 @@
#include "opt_cpu.h"
#include "opt_ddb.h"
-#include "opt_diagnostic.h"
#include "opt_ktrace.h"
#include "opt_trap.h"
#include "opt_vm86.h"
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index 356b644..aba2bc7 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/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.37 1998/01/08 23:42:06 eivind Exp $
+ * $Id: if_ed.c,v 1.38 1998/02/05 10:17:57 kato Exp $
*/
/*
@@ -60,7 +60,6 @@
#include "ed.h"
#include "bpfilter.h"
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "pnp.h"
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index a80fee7..d4ac0e8 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
- * $Id: machdep.c,v 1.74 1998/02/04 10:19:33 kato Exp $
+ * $Id: machdep.c,v 1.75 1998/02/05 10:05:43 kato Exp $
*/
#include "apm.h"
@@ -43,7 +43,6 @@
#include "opt_bounce.h"
#include "opt_cpu.h"
#include "opt_ddb.h"
-#include "opt_diagnostic.h"
#include "opt_maxmem.h"
#include "opt_perfmon.h"
#include "opt_smp.h"
diff --git a/sys/pc98/pc98/pc98.c b/sys/pc98/pc98/pc98.c
index 12a4713..811ea37 100644
--- a/sys/pc98/pc98/pc98.c
+++ b/sys/pc98/pc98/pc98.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: pc98.c,v 1.46 1998/01/31 14:48:52 kato Exp $
+ * $Id: pc98.c,v 1.47 1998/02/05 10:06:42 kato Exp $
*/
/*
@@ -47,8 +47,6 @@
* isa_dmastart()
*/
-#include "opt_diagnostic.h"
-
/*
* modified for PC9801 by A.Kojima F.Ukai M.Ishii
* Kyoto University Microcomputer Club (KMC)
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 35857e6..7f9e838 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -218,7 +218,6 @@
#ifdef __FreeBSD__
#include "bktr.h"
-#include "opt_diagnostic.h"
#include "pci.h"
#endif /* __FreeBSD__ */
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index dfea124..19f27b0 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ide_pci.c,v 1.7 1998/01/14 08:13:32 kato Exp $
+ * $Id: ide_pci.c,v 1.8 1998/02/04 22:33:21 eivind Exp $
*/
#include "pci.h"
@@ -36,8 +36,6 @@
#if NWDC > 0
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index c9dbc18..c01f608 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.56 1997/10/20 14:32:46 matt Exp $ */
-/* $Id: if_de.c,v 1.77 1998/01/08 23:42:24 eivind Exp $ */
+/* $Id: if_de.c,v 1.78 1998/02/04 22:33:24 eivind Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -39,7 +39,6 @@
*/
#define TULIP_HDR_DATA
-#include "opt_diagnostic.h"
#include "opt_inet.h"
#include "opt_ipx.h"
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index f326982..f2e6a74 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,10 +31,9 @@
* SUCH DAMAGE.
*
* @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95
- * $Id: ffs_alloc.c,v 1.45 1997/12/02 11:21:16 bde Exp $
+ * $Id: ffs_alloc.c,v 1.46 1998/02/04 22:33:27 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 317456c..60d2037 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)ffs_balloc.c 8.8 (Berkeley) 6/16/95
- * $Id: ffs_balloc.c,v 1.17 1998/01/06 05:23:33 dyson Exp $
+ * $Id: ffs_balloc.c,v 1.18 1998/02/04 22:33:31 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 7675b6a..b86c43e 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,10 +31,9 @@
* SUCH DAMAGE.
*
* @(#)ffs_inode.c 8.13 (Berkeley) 4/21/95
- * $Id: ffs_inode.c,v 1.32 1998/02/01 08:23:55 dyson Exp $
+ * $Id: ffs_inode.c,v 1.33 1998/02/04 22:33:31 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 7d40fd8..e2f7a74 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)ffs_subr.c 8.5 (Berkeley) 3/21/95
- * $Id: ffs_subr.c,v 1.16 1997/12/05 19:55:50 bde Exp $
+ * $Id: ffs_subr.c,v 1.17 1998/02/04 22:33:32 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <ufs/ffs/fs.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 65a10d0..058f76e 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,10 +31,9 @@
* SUCH DAMAGE.
*
* @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.68 1998/02/01 08:23:58 dyson Exp $
+ * $Id: ffs_vfsops.c,v 1.69 1998/02/04 22:33:33 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index e078862..522f089 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.40 1998/02/01 08:24:00 dyson Exp $
+ * $Id: ffs_vnops.c,v 1.41 1998/02/04 22:33:33 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/resourcevar.h>
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index b4af4bf..6b7d289 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.18 1998/01/24 02:01:41 dyson Exp $
+ * $Id: ufs_bmap.c,v 1.19 1998/02/04 22:33:35 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index 8729f62..56be3fd 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -31,11 +31,9 @@
* SUCH DAMAGE.
*
* @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.13 1997/12/05 19:55:51 bde Exp $
+ * $Id: ufs_ihash.c,v 1.14 1998/02/04 22:33:35 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 74423c0..1088807 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)ufs_lookup.c 8.15 (Berkeley) 6/16/95
- * $Id: ufs_lookup.c,v 1.19 1998/01/22 17:30:21 dyson Exp $
+ * $Id: ufs_lookup.c,v 1.20 1998/02/04 22:33:36 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index d318a02..20b4f23 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.16 1997/10/12 20:26:22 phk Exp $
+ * $Id: ufs_quota.c,v 1.17 1998/02/04 22:33:36 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index bb804b3..f771b58 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,10 +36,9 @@
* SUCH DAMAGE.
*
* @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.75 1998/01/31 19:28:28 julian Exp $
+ * $Id: ufs_vnops.c,v 1.76 1998/02/04 22:33:37 eivind Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_quota.h"
#include "opt_suiddir.h"
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index 4a1c4df..44d27af 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -28,11 +28,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: default_pager.c,v 1.13 1997/09/01 03:17:08 bde Exp $
+ * $Id: default_pager.c,v 1.14 1998/02/04 22:33:39 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 8878b87..348ace0 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,11 +36,9 @@
* SUCH DAMAGE.
*
* @(#)device_pager.c 8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.28 1998/01/31 11:56:25 dyson Exp $
+ * $Id: device_pager.c,v 1.29 1998/02/04 22:33:40 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index de978bd..b464b00 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
* from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
*
* @(#)swap_pager.c 8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.85 1998/02/03 00:50:36 dyson Exp $
+ * $Id: swap_pager.c,v 1.86 1998/02/04 22:33:41 eivind Exp $
*/
/*
@@ -49,8 +49,6 @@
* Deal with async writes in a better fashion
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 1ab4797..ea3080c 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,15 +66,13 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_fault.c,v 1.77 1998/01/31 11:56:32 dyson Exp $
+ * $Id: vm_fault.c,v 1.78 1998/02/04 22:33:43 eivind Exp $
*/
/*
* Page fault handling module.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 801673c..e98b9c3 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,10 +59,9 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_glue.c,v 1.71 1998/02/04 22:33:44 eivind Exp $
+ * $Id: vm_glue.c,v 1.72 1998/02/05 03:32:38 dyson Exp $
*/
-#include "opt_diagnostic.h"
#include "opt_rlimit.h"
#include <sys/param.h>
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index a572cb0..4eb8acc 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,15 +61,13 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_init.c,v 1.16 1997/08/02 14:33:26 bde Exp $
+ * $Id: vm_init.c,v 1.17 1998/02/04 22:33:45 eivind Exp $
*/
/*
* Initialize the Virtual Memory subsystem.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 794d560..a9fca2e 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,15 +61,13 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_kern.c,v 1.42 1998/02/04 22:33:45 eivind Exp $
+ * $Id: vm_kern.c,v 1.43 1998/02/05 03:32:39 dyson Exp $
*/
/*
* Kernel memory management.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 574693d..b060fc7 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,15 +61,13 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_map.c,v 1.110 1998/02/04 22:33:47 eivind Exp $
+ * $Id: vm_map.c,v 1.111 1998/02/05 03:32:41 dyson Exp $
*/
/*
* Virtual memory mapping module.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index ad61a3f..3184054 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.71 1997/12/31 02:35:29 alex Exp $
+ * $Id: vm_mmap.c,v 1.72 1998/02/04 22:33:48 eivind Exp $
*/
/*
@@ -46,7 +46,6 @@
*/
#include "opt_compat.h"
-#include "opt_diagnostic.h"
#include "opt_rlimit.h"
#include <sys/param.h>
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 72c9658..2eb01ef 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,15 +61,13 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_object.c,v 1.110 1998/02/04 22:33:50 eivind Exp $
+ * $Id: vm_object.c,v 1.111 1998/02/05 03:32:44 dyson Exp $
*/
/*
* Virtual memory object module.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h> /* for curproc, pageproc */
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index e0cdd27..439c517 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.90 1998/02/04 22:33:52 eivind Exp $
+ * $Id: vm_page.c,v 1.91 1998/02/05 03:32:46 dyson Exp $
*/
/*
@@ -68,8 +68,6 @@
* Resident memory management module.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 11c4d9f..ba87c3c 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,15 +65,13 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_pageout.c,v 1.111 1998/02/04 22:33:56 eivind Exp $
+ * $Id: vm_pageout.c,v 1.112 1998/02/05 03:32:48 dyson Exp $
*/
/*
* The proverbial page-out daemon.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index ff50b11..41f0297 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_pager.c,v 1.32 1998/01/24 02:01:46 dyson Exp $
+ * $Id: vm_pager.c,v 1.33 1998/02/04 22:33:57 eivind Exp $
*/
/*
@@ -69,8 +69,6 @@
* for builtin pagers.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 4245976..6c1d5ec 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -11,11 +11,9 @@
* 2. Absolutely no warranty of function or purpose is made by the author
* John S. Dyson.
*
- * $Id: vm_zone.c,v 1.15 1998/01/22 17:30:44 dyson Exp $
+ * $Id: vm_zone.c,v 1.16 1998/02/04 22:33:58 eivind Exp $
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 352c4a0..3f6d376 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91
- * $Id: vnode_pager.c,v 1.82 1998/02/04 22:34:03 eivind Exp $
+ * $Id: vnode_pager.c,v 1.83 1998/02/05 03:32:49 dyson Exp $
*/
/*
@@ -51,8 +51,6 @@
* greatly re-simplify the vnode_pager.
*/
-#include "opt_diagnostic.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
OpenPOWER on IntegriCloud