Turn DIAGNOSTIC into a new-style option.

15 files changed, 32 insertions, 12 deletions

diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 5f66ab9..d085d31 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -23,9 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $Id: busdma_machdep.c,v 1.1 1998/01/15 07:32:20 gibbs 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 fd39500..abb61ed 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.285 1998/01/30 10:26:20 dyson Exp $
+ *	$Id: machdep.c,v 1.286 1998/02/03 21:27:46 bde Exp $
  */
 
 #include "apm.h"
@@ -43,6 +43,7 @@
 #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 777812f..c12a276 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.179 1998/01/31 11:55:41 dyson Exp $
+ *	$Id: pmap.c,v 1.180 1998/02/03 22:09:01 bde Exp $
  */
 
 /*
@@ -68,6 +68,7 @@
  *	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 552aac8..eb859e8 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,10 +33,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.65 1997/12/14 02:11:13 dyson Exp $
+ *	$Id: swtch.s,v 1.66 1997/12/15 02:18:24 tegge 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 a51c7ee..8d7bd9e 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.119 1997/12/06 04:11:01 sef Exp $
+ *	$Id: trap.c,v 1.120 1998/01/31 05:00:15 eivind Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 
 #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 dc84438..3698c56 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -23,9 +23,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86.c,v 1.5 1997/11/20 18:43:46 bde Exp $
+ *	$Id: vm86.c,v 1.6 1998/02/03 21:27:47 bde 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 5f0d7b3..be470d6 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,11 +38,12 @@
  *
  *	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.96 1998/01/22 17:29:32 dyson Exp $
+ *	$Id: vm_machdep.c,v 1.97 1998/01/30 10:26:26 dyson 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 ba9c12f..5af6f1c 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.c
@@ -29,6 +29,8 @@
  *	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 5c9b64b..f818aad 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.71 1997/09/21 21:40:49 gibbs Exp $
+ *      $Id: aha1542.c,v 1.72 1997/11/18 10:56:41 bde Exp $
  */
 
 /*
@@ -20,6 +20,7 @@
  */
 
 #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 3f72f96..ad23ffd 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.129 1997/11/20 15:48:27 nate Exp $
+ *	$Id: if_ed.c,v 1.130 1998/01/08 23:40:45 eivind Exp $
  */
 
 /*
@@ -39,6 +39,7 @@
 
 #include "ed.h"
 #include "bpfilter.h"
+#include "opt_diagnostic.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index b4945e0..81d5a60 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.69 1997/12/15 20:30:43 eivind Exp $
+ *  $Id: if_ep.c,v 1.70 1998/01/08 23:40:50 eivind Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -60,6 +60,7 @@
 #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 71d9934..4c3e1c8 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -65,6 +65,7 @@
 #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 3f9440d..f9a63bf 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.108 1997/11/30 09:44:28 jmg Exp $
+ *	$Id: isa.c,v 1.109 1998/01/31 03:29:00 eivind Exp $
  */
 
 /*
@@ -47,6 +47,8 @@
  * 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 d34c01b..5a551cf 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -64,6 +64,8 @@
 #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 cba303a..c051291 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,9 +25,11 @@
  * (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.20 1997/11/06 19:29:04 phk Exp $
+ *  $Id: linux_sysvec.c,v 1.21 1997/12/16 17:40:12 eivind Exp $
  */
 
+#include "opt_diagnostic.h"
+
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"