Back out DIAGNOSTIC changes.

27 files changed, 26 insertions, 71 deletions

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>