Turn DIAGNOSTIC into a new-style option.

7 files changed, 15 insertions, 7 deletions

diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index 5f66ab9..d085d31 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/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/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index 552aac8..eb859e8 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.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/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index fd39500..abb61ed 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.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/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 777812f..c12a276 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.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/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index 552aac8..eb859e8 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/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/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index a51c7ee..8d7bd9e 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.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/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 5f0d7b3..be470d6 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/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"