Back out DIAGNOSTIC changes.

15 files changed, 15 insertions, 43 deletions

diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index 4a1c4df..44d27af 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -28,11 +28,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: default_pager.c,v 1.13 1997/09/01 03:17:08 bde Exp $
+ *	$Id: default_pager.c,v 1.14 1998/02/04 22:33:39 eivind Exp $
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 8878b87..348ace0 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,11 +36,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.28 1998/01/31 11:56:25 dyson Exp $
+ * $Id: device_pager.c,v 1.29 1998/02/04 22:33:40 eivind Exp $
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index de978bd..b464b00 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -39,7 +39,7 @@
  * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
- * $Id: swap_pager.c,v 1.85 1998/02/03 00:50:36 dyson Exp $
+ * $Id: swap_pager.c,v 1.86 1998/02/04 22:33:41 eivind Exp $
  */
 
 /*
@@ -49,8 +49,6 @@
  *	Deal with async writes in a better fashion
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 1ab4797..ea3080c 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,15 +66,13 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_fault.c,v 1.77 1998/01/31 11:56:32 dyson Exp $
+ * $Id: vm_fault.c,v 1.78 1998/02/04 22:33:43 eivind Exp $
  */
 
 /*
  *	Page fault handling module.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 801673c..e98b9c3 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,10 +59,9 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.71 1998/02/04 22:33:44 eivind Exp $
+ * $Id: vm_glue.c,v 1.72 1998/02/05 03:32:38 dyson Exp $
  */
 
-#include "opt_diagnostic.h"
 #include "opt_rlimit.h"
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index a572cb0..4eb8acc 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,15 +61,13 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_init.c,v 1.16 1997/08/02 14:33:26 bde Exp $
+ * $Id: vm_init.c,v 1.17 1998/02/04 22:33:45 eivind Exp $
  */
 
 /*
  *	Initialize the Virtual Memory subsystem.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 794d560..a9fca2e 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,15 +61,13 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.42 1998/02/04 22:33:45 eivind Exp $
+ * $Id: vm_kern.c,v 1.43 1998/02/05 03:32:39 dyson Exp $
  */
 
 /*
  *	Kernel memory management.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 574693d..b060fc7 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,15 +61,13 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.110 1998/02/04 22:33:47 eivind Exp $
+ * $Id: vm_map.c,v 1.111 1998/02/05 03:32:41 dyson Exp $
  */
 
 /*
  *	Virtual memory mapping module.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index ad61a3f..3184054 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.71 1997/12/31 02:35:29 alex Exp $
+ * $Id: vm_mmap.c,v 1.72 1998/02/04 22:33:48 eivind Exp $
  */
 
 /*
@@ -46,7 +46,6 @@
  */
 
 #include "opt_compat.h"
-#include "opt_diagnostic.h"
 #include "opt_rlimit.h"
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 72c9658..2eb01ef 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,15 +61,13 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.110 1998/02/04 22:33:50 eivind Exp $
+ * $Id: vm_object.c,v 1.111 1998/02/05 03:32:44 dyson Exp $
  */
 
 /*
  *	Virtual memory object module.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>		/* for curproc, pageproc */
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index e0cdd27..439c517 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- *	$Id: vm_page.c,v 1.90 1998/02/04 22:33:52 eivind Exp $
+ *	$Id: vm_page.c,v 1.91 1998/02/05 03:32:46 dyson Exp $
  */
 
 /*
@@ -68,8 +68,6 @@
  *	Resident memory management module.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 11c4d9f..ba87c3c 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,15 +65,13 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.111 1998/02/04 22:33:56 eivind Exp $
+ * $Id: vm_pageout.c,v 1.112 1998/02/05 03:32:48 dyson Exp $
  */
 
 /*
  *	The proverbial page-out daemon.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index ff50b11..41f0297 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.32 1998/01/24 02:01:46 dyson Exp $
+ * $Id: vm_pager.c,v 1.33 1998/02/04 22:33:57 eivind Exp $
  */
 
 /*
@@ -69,8 +69,6 @@
  *	for builtin pagers.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 4245976..6c1d5ec 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -11,11 +11,9 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $Id: vm_zone.c,v 1.15 1998/01/22 17:30:44 dyson Exp $
+ * $Id: vm_zone.c,v 1.16 1998/02/04 22:33:58 eivind Exp $
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index 352c4a0..3f6d376 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.82 1998/02/04 22:34:03 eivind Exp $
+ *	$Id: vnode_pager.c,v 1.83 1998/02/05 03:32:49 dyson Exp $
  */
 
 /*
@@ -51,8 +51,6 @@
  *	greatly re-simplify the vnode_pager.
  */
 
-#include "opt_diagnostic.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>