Back out DIAGNOSTIC changes.

8 files changed, 8 insertions, 18 deletions

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>