turn off DEBUG and DIAGNOSTIC in GENERIC kernels so that they

are compatible with the LKMs that are part of the release.
2005-11-03 16:48:29 +00:00 · 2005-11-03 16:48:29 +00:00 · 59fddeceaa
parent 504edaa687
commit 59fddeceaa
23 changed files with 73 additions and 68 deletions
--- a/sys/arch/acorn26/conf/GENERIC
+++ b/sys/arch/acorn26/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.36 2005/09/10 19:20:48 jmmv Exp $
+# $NetBSD: GENERIC,v 1.37 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -30,8 +30,8 @@ options 	CPU_ARM250
 options 	CPU_ARM3

 # Diagnostic/debugging support options
-options 	DIAGNOSTIC		# Cheap kernel consistency checks
-options 	DEBUG			# More expensive checks and printfs
+#options 	DIAGNOSTIC		# Cheap kernel consistency checks
+#options 	DEBUG			# More expensive checks and printfs
 options 	DDB			# kernel debugger
 #options 	SYSCALL_DEBUG		# trace syscall entry/exit
 #options 	SCSIDEBUG
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.61 2005/09/10 19:20:48 jmmv Exp $
+# 	$NetBSD: GENERIC,v 1.62 2005/11/03 16:48:29 chs Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident		"GENERIC-$Revision: 1.61 $"
+#ident		"GENERIC-$Revision: 1.62 $"

 # estimated number of users
 maxusers	32
@ -165,7 +165,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel

 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
-options 	DIAGNOSTIC	# internal consistency checks
+#options 	DIAGNOSTIC	# internal consistency checks
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	IPKDB		# remote kernel debugging
 options 	DDB		# in-kernel debugger
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@ -22,7 +22,7 @@ include		"arch/alpha/conf/std.alpha"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.276 $"
+#ident 		"GENERIC-$Revision: 1.277 $"

 maxusers 32

@ -58,7 +58,7 @@ options 	NTP			# kernel PLL for NTP
 #options 	BUFQ_PRIOCSCAN

 # Diagnostic/debugging support options
-options 	DIAGNOSTIC		# Cheap kernel consistency checks
+#options 	DIAGNOSTIC		# Cheap kernel consistency checks
 options 	DDB			# kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 #makeoptions	DEBUG="-g"
--- a/sys/arch/amiga/conf/GENERIC.in
+++ b/sys/arch/amiga/conf/GENERIC.in
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.44 2005/10/07 17:46:33 tsutsui Exp $
+# $NetBSD: GENERIC.in,v 1.45 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 #
@ -56,7 +56,7 @@ include "arch/amiga/conf/std.amiga"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.44 $"
+#ident 		"GENERIC-$Revision: 1.45 $"

 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@ -254,7 +254,7 @@ options 	NTP		# NTP phase/frequency locked loop
 #
 options 	DDB		# Kernel debugger
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
-options 	DIAGNOSTIC	# Extra kernel sanity checks
+#options 	DIAGNOSTIC	# Extra kernel sanity checks
 #options 	DEBUG		# Enable misc. kernel debugging code
 #options 	SYSCALL_DEBUG	# debug all syscalls.
 #options 	SCSIDEBUG	# Add SCSI debugging statements
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.124 2005/09/10 19:20:48 jmmv Exp $
+# $NetBSD: GENERIC,v 1.125 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include		"arch/arc/conf/std.arc"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident		"GENERIC-$Revision: 1.124 $"
+#ident		"GENERIC-$Revision: 1.125 $"

 maxusers	32		# estimated number of users

@ -69,7 +69,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 #options 	BUFQ_PRIOCSCAN

 # Diagnostic/debugging support options
-options 	DIAGNOSTIC		# cheap kernel consistency checks
+#options 	DIAGNOSTIC		# cheap kernel consistency checks
 #options 	DEBUG			# expensive debugging checks/support
 #options 	KMEMSTATS		# kernel memory statistics (vmstat -m)
 options 	DDB			# in-kernel debugger
--- a/sys/arch/atari/conf/GENERIC.in
+++ b/sys/arch/atari/conf/GENERIC.in
@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.in,v 1.55 2005/08/19 05:19:50 christos Exp $
+#	$NetBSD: GENERIC.in,v 1.56 2005/11/03 16:48:29 chs Exp $
 #
 # Generic atari
 #
@ -183,7 +183,7 @@ options 	P1003_1B_SEMAPHORE # p1003.1b semaphore support
 #
 options 	KTRACE			# Add kernel tracing system call
 options 	SYSTRACE		# system call vetting via systrace(1)
-options 	DIAGNOSTIC		# Add additional error checking code
+#options 	DIAGNOSTIC		# Add additional error checking code
 options 	USERCONF		# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
--- a/sys/arch/bebox/conf/GENERIC
+++ b/sys/arch/bebox/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.88 2005/09/10 19:20:48 jmmv Exp $
+# $NetBSD: GENERIC,v 1.89 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include 	"arch/bebox/conf/std.bebox"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.88 $"
+#ident 		"GENERIC-$Revision: 1.89 $"

 maxusers	32

@ -33,8 +33,8 @@ maxusers	32
 #options 	IPKDBSECURE	# Allow debugging even when securelevel > 0
 makeoptions	DEBUG="-g"

-options 	DEBUG
-options 	DIAGNOSTIC
+#options 	DEBUG
+#options 	DIAGNOSTIC
 options 	TRAP_PANICWAIT
 options 	DDB
 #options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.91 2005/09/10 19:20:48 jmmv Exp $
+# $NetBSD: GENERIC,v 1.92 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -195,7 +195,7 @@ options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
 # Development and Debugging options

 #options 	PORTMASTER	# Enable PortMaster only options
-options 	DIAGNOSTIC	# internally consistency checks
+#options 	DIAGNOSTIC	# internally consistency checks
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	IPKDB		# remote kernel debugging
 options 	DDB		# in-kernel debugger
--- a/sys/arch/cesfic/conf/GENERIC
+++ b/sys/arch/cesfic/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.37 2005/09/10 19:20:49 jmmv Exp $
+# $NetBSD: GENERIC,v 1.38 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -113,8 +113,8 @@ options 	COMPAT_M68K4K	# compat. with NetBSD/m68k4k binaries
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables

 # Debugging options
-options 	DIAGNOSTIC	# Extra kernel sanity checks
-options 	DEBUG		# Enable misc. kernel debugging code
+#options 	DIAGNOSTIC	# Extra kernel sanity checks
+#options 	DEBUG		# Enable misc. kernel debugging code
 options 	DDB		# Kernel Dynamic Debugger
 #options 	KGDB
 makeoptions	DEBUG="-g"	# netbsd.gdb with full debugging symbols
--- a/sys/arch/cobalt/conf/GENERIC
+++ b/sys/arch/cobalt/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.82 2005/09/10 19:20:49 jmmv Exp $
+# $NetBSD: GENERIC,v 1.83 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.82 $"
+#ident 		"GENERIC-$Revision: 1.83 $"

 maxusers	32

@ -50,7 +50,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 #options 	BUFQ_PRIOCSCAN

 # Debugging options
-options 	DIAGNOSTIC	# extra kernel sanity checking
+#options 	DIAGNOSTIC	# extra kernel sanity checking
 #options 	DEBUG		# extra kernel debugging support
 #options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
 options 	DDB		# kernel dynamic debugger
--- a/sys/arch/dreamcast/conf/GENERIC
+++ b/sys/arch/dreamcast/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.61 2005/09/10 19:20:49 jmmv Exp $
+# $NetBSD: GENERIC,v 1.62 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -49,7 +49,7 @@ options 	SYSVSHM		# System V-like memory sharing
 options 	P1003_1B_SEMAPHORE # p1003.1b semaphore support

 # Diagnostic/debugging support options
-options 	DIAGNOSTIC	# cheap kernel consistency checks
+#options 	DIAGNOSTIC	# cheap kernel consistency checks
 #options 	DEBUG		# expensive debugging checks/support
 #options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
 options 	DDB		# in-kernel debugger
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.123 2005/09/10 19:20:49 jmmv Exp $
+# $NetBSD: GENERIC,v 1.124 2005/11/03 16:48:29 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include 	"arch/hp300/conf/std.hp300"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.123 $"
+#ident 		"GENERIC-$Revision: 1.124 $"

 maxusers	32		# estimated number of users

@ -68,7 +68,7 @@ options 	P1003_1B_SEMAPHORE # p1003.1b semaphore support
 #options 	BUFQ_PRIOCSCAN

 # Debugging options
-options 	DIAGNOSTIC	# Extra kernel sanity checks
+#options 	DIAGNOSTIC	# Extra kernel sanity checks
 #options 	DEBUG		# Enable misc. kernel debugging code
 #options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
 options 	DDB		# Kernel Dynamic Debugger
--- a/sys/arch/iyonix/conf/GENERIC
+++ b/sys/arch/iyonix/conf/GENERIC
@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.20 2005/09/10 19:20:49 jmmv Exp $
+#	$NetBSD: GENERIC,v 1.21 2005/11/03 16:48:29 chs Exp $
 #
 #	GENERIC -- Generic kernel
 #
@ -141,8 +141,8 @@ options 	USERCONF	# userconf(4) support
 # Development and Debugging options

 options 	PERFCTRS	# performance counters
-options 	DIAGNOSTIC	# internally consistency checks
-options 	DEBUG
+#options 	DIAGNOSTIC	# internally consistency checks
+#options 	DEBUG
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	IPKDB		# remote kernel debugging
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.213 2005/09/10 19:20:49 jmmv Exp $
+# $NetBSD: GENERIC,v 1.214 2005/11/03 16:48:30 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.213 $"
+#ident 		"GENERIC-$Revision: 1.214 $"

 maxusers	32

@ -58,7 +58,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 #options 	BUFQ_PRIOCSCAN

 # Diagnostic/debugging support options
-options 	DIAGNOSTIC	# cheap kernel consistency checks
+#options 	DIAGNOSTIC	# cheap kernel consistency checks
 #options 	DEBUG		# expensive debugging checks/support
 options 	ZS_CONSOLE_ABORT# allow break to get into DDB on serial
 options 	DDB		# in-kernel debugger
--- a/sys/arch/mipsco/conf/GENERIC
+++ b/sys/arch/mipsco/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.52 2005/09/10 19:20:49 jmmv Exp $
+# $NetBSD: GENERIC,v 1.53 2005/11/03 16:48:30 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -54,7 +54,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 options 	DDB			# kernel dynamic debugger
 options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
 #options 	DEBUG			# extra kernel debugging support
-options 	DIAGNOSTIC		# extra kernel sanity checking
+#options 	DIAGNOSTIC		# extra kernel sanity checking
 options 	SCSIVERBOSE		# Verbose SCSI errors

 #options 	KGDB			# Remote kernel debug using gdb
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.60 2005/09/10 19:20:50 jmmv Exp $
+# $NetBSD: GENERIC,v 1.61 2005/11/03 16:48:30 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include		"arch/mvme68k/conf/std.mvme68k"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.60 $"
+#ident 		"GENERIC-$Revision: 1.61 $"

 # Boards this kernel supports
 options 	MVME147
@ -40,7 +40,8 @@ options 	FPSP
 options 	M060SP

 #options 	DDB
-options 	DIAGNOSTIC, DEBUG
+#options 	DIAGNOSTIC
+#options 	DEBUG

 #options 	SYSVSHM
 options 	KTRACE
--- a/sys/arch/netwinder/conf/GENERIC
+++ b/sys/arch/netwinder/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.69 2005/09/10 19:20:50 jmmv Exp $
+# $NetBSD: GENERIC,v 1.70 2005/11/03 16:48:30 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -174,7 +174,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel

 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
-options 	DIAGNOSTIC	# internally consistency checks
+#options 	DIAGNOSTIC	# internally consistency checks
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	IPKDB		# remote kernel debugging
 options 	DDB		# in-kernel debugger
--- a/sys/arch/next68k/conf/GENERIC
+++ b/sys/arch/next68k/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.95 2005/09/10 19:20:50 jmmv Exp $
+# $NetBSD: GENERIC,v 1.96 2005/11/03 16:48:30 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include 	"arch/next68k/conf/std.next68k"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.95 $"
+#ident 		"GENERIC-$Revision: 1.96 $"

 # Needs to be set per system.  i.e change these as you see fit
 maxusers	16
@ -51,8 +51,8 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 #options 	BUFQ_READPRIO
 #options 	BUFQ_PRIOCSCAN

-options 	DEBUG		# kernel debugging code
-options 	DIAGNOSTIC	# extra kernel sanity checking
+#options 	DEBUG		# kernel debugging code
+#options 	DIAGNOSTIC	# extra kernel sanity checking

 # Which kernel debugger?  Uncomment either this:
 options 	DDB
--- a/sys/arch/ofppc/conf/GENERIC
+++ b/sys/arch/ofppc/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.84 2005/09/10 19:20:50 jmmv Exp $
+# $NetBSD: GENERIC,v 1.85 2005/11/03 16:48:30 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include 	"arch/ofppc/conf/std.ofppc"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.84 $"
+#ident 		"GENERIC-$Revision: 1.85 $"

 maxusers	32

@ -52,7 +52,7 @@ options 	USERCONF	# userconf(4) support
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel

 # Diagnostic/debugging support options
-options 	DIAGNOSTIC	# cheap kernel consistency checks
+#options 	DIAGNOSTIC	# cheap kernel consistency checks
 #options 	DEBUG		# expensive debugging checks/support
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
--- a/sys/arch/pdp10/conf/GENERIC
+++ b/sys/arch/pdp10/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.18 2005/09/10 19:20:50 jmmv Exp $
+# $NetBSD: GENERIC,v 1.19 2005/11/03 16:48:30 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include		"arch/pdp10/conf/std.pdp10"

 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.18 $"
+#ident 		"GENERIC-$Revision: 1.19 $"

 # Here are all different supported CPU types listed.
 options 	KL10
@ -35,10 +35,10 @@ maxusers	8
 options 	DDB
 options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
 #options 	KTRACE
-options 	DIAGNOSTIC
-options 	DEBUG,KMEMSTATS,LOCKDEBUG
+#options 	DIAGNOSTIC
+#options 	DEBUG
+#options 	KMEMSTATS
 options 	NO_KERNEL_RCSIDS
-options 	MALLOC_DEBUG

 # Networking options
 #options 	GATEWAY		# packet forwarding
--- a/sys/arch/sbmips/conf/GENERIC
+++ b/sys/arch/sbmips/conf/GENERIC
@ -1,13 +1,13 @@
-# $NetBSD: GENERIC,v 1.45 2005/09/10 19:20:50 jmmv Exp $
+# $NetBSD: GENERIC,v 1.46 2005/11/03 16:48:30 chs Exp $

 include 	"arch/sbmips/conf/std.sbmips"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.45 $"
+#ident 		"GENERIC-$Revision: 1.46 $"

 #options 	LOCKDEBUG	# XXX XXX XXX XXX
-options 	DEBUG		# extra kernel debugging support
+#options 	DEBUG		# extra kernel debugging support

 # The following three options are required for BCM1250 pass 1 silicon
 #options 	SB1250_PASS1
@ -28,7 +28,7 @@ options 	LKM		# loadable kernel modules
 #options 	NTP		# network time protocol

 # Debugging options
-options 	DIAGNOSTIC	# extra kernel sanity checking
+#options 	DIAGNOSTIC	# extra kernel sanity checking
 #options 	DEBUG		# extra kernel debugging support
 #options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
 options 	USERCONF	# userconf(4) support
--- a/sys/arch/shark/conf/GENERIC
+++ b/sys/arch/shark/conf/GENERIC
@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.52 2005/09/10 19:20:50 jmmv Exp $
+#	$NetBSD: GENERIC,v 1.53 2005/11/03 16:48:30 chs Exp $
 #
 # Generic Shark configuration.
 #
@ -7,7 +7,7 @@ include	"arch/shark/conf/std.shark"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident		"GENERIC-$Revision: 1.52 $"
+#ident		"GENERIC-$Revision: 1.53 $"

 # estimated number of users
 maxusers	32
@ -162,7 +162,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel

 #options 	ARM700BUGTRACK	# track the ARM700 swi bug
 #options 	PORTMASTER	# Enable PortMaster only options
-options 	DIAGNOSTIC	# internal consistency checks
+#options 	DIAGNOSTIC	# internal consistency checks
 #options 	PMAP_DEBUG	# Enable pmap_debug_level code
 #options 	IPKDB		# remote kernel debugging
 options 	DDB		# in-kernel debugger
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.142 2005/10/10 01:06:24 hubertf Exp $
+# $NetBSD: GENERIC,v 1.143 2005/11/03 16:48:30 chs Exp $
 #
 # GENERIC machine description file
 # 
@ -22,7 +22,7 @@ include		"arch/vax/conf/std.vax"

 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

-#ident 		"GENERIC-$Revision: 1.142 $"
+#ident 		"GENERIC-$Revision: 1.143 $"

 # Here are all different supported CPU types listed.
 #options 	VAX8800		# VAX 8500, 8530, 8550, 8700, 8800
@ -53,7 +53,11 @@ options 	DDB
 options 	KTRACE
 options 	SYSTRACE	# system call vetting via systrace(1)
 #options 	DIAGNOSTIC
-#options 	DEBUG,KMEMSTATS,PMAPDEBUG,TRAPDEBUG,LOCKDEBUG
+#options 	DEBUG
+#options 	KMEMSTATS
+#options 	PMAPDEBUG
+#options 	TRAPDEBUG
+#options 	LOCKDEBUG

 options 	SCSIVERBOSE		# Verbose SCSI errors