Back out DIAGNOSTIC changes.

1998-02-06 12:14:30 +00:00 · 1998-02-06 12:14:30 +00:00 · 15aa079292
commit 15aa079292
parent 2e3cbdd972
159 changed files with 136 additions and 400 deletions
--- 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"

--- 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>
--- 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"

--- 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"
--- 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>
--- 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"

--- 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"
--- 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"

--- 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>
--- 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__ */

--- 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"

--- 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"

--- 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"

--- 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 */
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 $	*/

 /*-
@ -48,11 +48,6 @@
 * October 1992
 */

-/*
- * Option include files
- */
-#include "opt_diagnostic.h"
-
 /*
 * kernel include files.
 */
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

--- 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>
--- 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"
--- 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>
--- 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"

--- 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"
--- 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>
--- 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"

--- 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>
--- 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>
--- 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"

--- 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"

--- 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 */
--- 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>
--- 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 );
--- 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"

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 */
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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 $	*/

 /*-
@ -48,11 +48,6 @@
 * October 1992
 */

-/*
- * Option include files
- */
-#include "opt_diagnostic.h"
-
 /*
 * kernel include files.
 */
--- 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>
--- a/Show More
+++ b/Show More