Module Name: src
Committed By: martin
Date: Wed Jul 5 13:58:49 UTC 2017
Modified Files:
src/sys/arch/amd64/conf [netbsd-8]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/cobalt/conf [netbsd-8]: GENERIC
src/sys/arch/evbarm/conf [netbsd-8]: BEAGLEBOARD BEAGLEBOARDXM
BEAGLEBONE GENERIC.common
src/sys/arch/i386/conf [netbsd-8]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/landisk/conf [netbsd-8]: GENERIC
src/sys/arch/mvmeppc/conf [netbsd-8]: GENERIC
src/sys/arch/pmax/conf [netbsd-8]: GENERIC
src/sys/arch/shark/conf [netbsd-8]: GENERIC
src/sys/arch/sparc64/conf [netbsd-8]: GENERIC
src/sys/arch/zaurus/conf [netbsd-8]: GENERIC
Log Message:
Remove options DIAGNOSTIC/DEBUG and PAX debug options.
Requested by snj in #60.
To generate a diff of this commit:
cvs rdiff -u -r1.459 -r1.459.2.1 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.135.4.1 -r1.135.4.2 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.151 -r1.151.8.1 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.61 -r1.61.6.1 src/sys/arch/evbarm/conf/BEAGLEBOARD
cvs rdiff -u -r1.23.6.1 -r1.23.6.2 src/sys/arch/evbarm/conf/BEAGLEBOARDXM
cvs rdiff -u -r1.42.2.1 -r1.42.2.2 src/sys/arch/evbarm/conf/BEAGLEBONE
cvs rdiff -u -r1.18 -r1.18.6.1 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.1156 -r1.1156.2.1 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.112.4.1 -r1.112.4.2 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.77 -r1.77.2.1 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.54 -r1.54.6.1 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.27 -r1.27.6.1 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.190 -r1.190.8.1 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.127 -r1.127.6.1 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.198 -r1.198.6.1 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.73 -r1.73.6.1 src/sys/arch/zaurus/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.459 src/sys/arch/amd64/conf/GENERIC:1.459.2.1
--- src/sys/arch/amd64/conf/GENERIC:1.459 Sat May 27 22:53:29 2017
+++ src/sys/arch/amd64/conf/GENERIC Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.459 2017/05/27 22:53:29 bouyer Exp $
+# $NetBSD: GENERIC,v 1.459.2.1 2017/07/05 13:58:48 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.459 $"
+#ident "GENERIC-$Revision: 1.459.2.1 $"
maxusers 64 # estimated number of users
@@ -89,7 +89,7 @@ vmt0 at cpu0 # VMware Tools
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # inexpensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive kernel consistency checks
# XXX to be commented out on release branch
#options DEBUG # expensive debugging checks/support
#options LOCKDEBUG # expensive locking checks/support
@@ -1339,6 +1339,6 @@ options VERIFIED_EXEC_FP_MD5
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
-options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+#options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
-options PAX_ASLR_DEBUG=1 # PaX ASLR debug
+#options PAX_ASLR_DEBUG=1 # PaX ASLR debug
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.1 src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.2
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.135.4.1 Fri Jun 30 06:27:38 2017
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.135.4.1 2017/06/30 06:27:38 snj Exp $
+# $NetBSD: XEN3_DOM0,v 1.135.4.2 2017/07/05 13:58:48 martin Exp $
include "arch/amd64/conf/std.xen"
@@ -50,7 +50,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # inexpensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.75 src/sys/arch/amd64/conf/XEN3_DOMU:1.75.2.1
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.75 Sun May 21 06:19:37 2017
+++ src/sys/arch/amd64/conf/XEN3_DOMU Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.75 2017/05/21 06:19:37 pgoyette Exp $
+# $NetBSD: XEN3_DOMU,v 1.75.2.1 2017/07/05 13:58:48 martin Exp $
include "arch/amd64/conf/std.xen"
@@ -42,7 +42,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # inexpensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.151 src/sys/arch/cobalt/conf/GENERIC:1.151.8.1
--- src/sys/arch/cobalt/conf/GENERIC:1.151 Tue Dec 13 20:42:17 2016
+++ src/sys/arch/cobalt/conf/GENERIC Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.151 2016/12/13 20:42:17 christos Exp $
+# $NetBSD: GENERIC,v 1.151.8.1 2017/07/05 13:58:48 martin 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.151 $"
+#ident "GENERIC-$Revision: 1.151.8.1 $"
maxusers 32
@@ -42,7 +42,7 @@ options SYSCTL_INCLUDE_DESCR # Include
#options BUFQ_PRIOCSCAN
# Debugging options
-options DIAGNOSTIC # extra kernel sanity checking
+#options DIAGNOSTIC # extra kernel sanity checking
#options DEBUG # extra kernel debugging support
options DDB # kernel dynamic debugger
#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
Index: src/sys/arch/evbarm/conf/BEAGLEBOARD
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.61 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.61.6.1
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.61 Sun Feb 19 07:47:00 2017
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD Wed Jul 5 13:58:48 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBOARD,v 1.61 2017/02/19 07:47:00 rin Exp $
+# $NetBSD: BEAGLEBOARD,v 1.61.6.1 2017/07/05 13:58:48 martin Exp $
#
# BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
#
@@ -125,7 +125,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
#options PERFCTRS # performance counters
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options IPKDB # remote kernel debugging
Index: src/sys/arch/evbarm/conf/BEAGLEBOARDXM
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.23.6.1 src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.23.6.2
--- src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.23.6.1 Sat Jul 1 08:49:28 2017
+++ src/sys/arch/evbarm/conf/BEAGLEBOARDXM Wed Jul 5 13:58:48 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBOARDXM,v 1.23.6.1 2017/07/01 08:49:28 snj Exp $
+# $NetBSD: BEAGLEBOARDXM,v 1.23.6.2 2017/07/05 13:58:48 martin Exp $
#
# BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
#
@@ -124,7 +124,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
#options PERFCTRS # performance counters
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options IPKDB # remote kernel debugging
Index: src/sys/arch/evbarm/conf/BEAGLEBONE
diff -u src/sys/arch/evbarm/conf/BEAGLEBONE:1.42.2.1 src/sys/arch/evbarm/conf/BEAGLEBONE:1.42.2.2
--- src/sys/arch/evbarm/conf/BEAGLEBONE:1.42.2.1 Sat Jul 1 08:49:28 2017
+++ src/sys/arch/evbarm/conf/BEAGLEBONE Wed Jul 5 13:58:48 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: BEAGLEBONE,v 1.42.2.1 2017/07/01 08:49:28 snj Exp $
+# $NetBSD: BEAGLEBONE,v 1.42.2.2 2017/07/05 13:58:48 martin Exp $
#
# BEAGLEBONE -- TI AM335x board Kernel
#
@@ -20,7 +20,7 @@ options TI_AM335X
# Development and Debugging options
-options DEBUG
+#options DEBUG
makeoptions DEBUG="-g" # compile full symbol table
makeoptions COPY_SYMTAB=1
Index: src/sys/arch/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.18 src/sys/arch/evbarm/conf/GENERIC.common:1.18.6.1
--- src/sys/arch/evbarm/conf/GENERIC.common:1.18 Wed Mar 22 16:07:12 2017
+++ src/sys/arch/evbarm/conf/GENERIC.common Wed Jul 5 13:58:48 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.common,v 1.18 2017/03/22 16:07:12 skrll Exp $
+# $NetBSD: GENERIC.common,v 1.18.6.1 2017/07/05 13:58:48 martin Exp $
#
# GENERIC evbarm kernel config (template)
#
@@ -122,7 +122,7 @@ options BUFQ_PRIOCSCAN
# Development and Debugging options
#options PERFCTRS # performance counters
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
options KDTRACE_HOOKS # kernel DTrace hooks
#options LOCKDEBUG
@@ -186,8 +186,8 @@ options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
-options PAX_ASLR_DEBUG=1 # PaX ASLR debug
+#options PAX_ASLR_DEBUG=1 # PaX ASLR debug
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
-options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+#options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1156 src/sys/arch/i386/conf/GENERIC:1.1156.2.1
--- src/sys/arch/i386/conf/GENERIC:1.1156 Sat May 27 22:53:29 2017
+++ src/sys/arch/i386/conf/GENERIC Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1156 2017/05/27 22:53:29 bouyer Exp $
+# $NetBSD: GENERIC,v 1.1156.2.1 2017/07/05 13:58:48 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1156 $"
+#ident "GENERIC-$Revision: 1.1156.2.1 $"
maxusers 64 # estimated number of users
@@ -107,7 +107,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # inexpensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive kernel consistency checks
# XXX to be commented out on release branch
#options DEBUG # expensive debugging checks/support
#options LOCKDEBUG # expensive locking checks/support
@@ -1733,8 +1733,8 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
-options PAX_ASLR_DEBUG=1 # PaX ASLR debug
+#options PAX_ASLR_DEBUG=1 # PaX ASLR debug
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
-options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+#options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.1 src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.2
--- src/sys/arch/i386/conf/XEN3_DOM0:1.112.4.1 Fri Jun 30 06:27:38 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0 Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.112.4.1 2017/06/30 06:27:38 snj Exp $
+# $NetBSD: XEN3_DOM0,v 1.112.4.2 2017/07/05 13:58:48 martin Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -66,7 +66,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # inexpensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.77 src/sys/arch/i386/conf/XEN3_DOMU:1.77.2.1
--- src/sys/arch/i386/conf/XEN3_DOMU:1.77 Sun May 21 06:19:37 2017
+++ src/sys/arch/i386/conf/XEN3_DOMU Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.77 2017/05/21 06:19:37 pgoyette Exp $
+# $NetBSD: XEN3_DOMU,v 1.77.2.1 2017/07/05 13:58:48 martin Exp $
include "arch/xen/conf/std.xen"
@@ -50,7 +50,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # inexpensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.54 src/sys/arch/landisk/conf/GENERIC:1.54.6.1
--- src/sys/arch/landisk/conf/GENERIC:1.54 Sun Feb 19 07:47:01 2017
+++ src/sys/arch/landisk/conf/GENERIC Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.54 2017/02/19 07:47:01 rin Exp $
+# $NetBSD: GENERIC,v 1.54.6.1 2017/07/05 13:58:48 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.54 $"
+#ident "GENERIC-$Revision: 1.54.6.1 $"
maxusers 16 # estimated number of users
@@ -497,8 +497,8 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
-options PAX_ASLR_DEBUG=1 # PaX ASLR debug
+#options PAX_ASLR_DEBUG=1 # PaX ASLR debug
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
-options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+#options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
Index: src/sys/arch/mvmeppc/conf/GENERIC
diff -u src/sys/arch/mvmeppc/conf/GENERIC:1.27 src/sys/arch/mvmeppc/conf/GENERIC:1.27.6.1
--- src/sys/arch/mvmeppc/conf/GENERIC:1.27 Sun Feb 19 07:47:01 2017
+++ src/sys/arch/mvmeppc/conf/GENERIC Wed Jul 5 13:58:48 2017
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.27 2017/02/19 07:47:01 rin Exp $
+# $NetBSD: GENERIC,v 1.27.6.1 2017/07/05 13:58:48 martin Exp $
#
include "arch/mvmeppc/conf/std.mvmeppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.27 $"
+ident "GENERIC-$Revision: 1.27.6.1 $"
maxusers 8
@@ -29,8 +29,8 @@ options PIPE_SOCKETPAIR # smaller, but
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Diagnostic/debugging support options
-options DIAGNOSTIC # cheap kernel consistency checks
-options DEBUG # expensive debugging checks/support
+#options DIAGNOSTIC # cheap kernel consistency checks
+#options DEBUG # expensive debugging checks/support
options DDB # in-kernel debugger
pseudo-device ksyms
#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
Index: src/sys/arch/pmax/conf/GENERIC
diff -u src/sys/arch/pmax/conf/GENERIC:1.190 src/sys/arch/pmax/conf/GENERIC:1.190.8.1
--- src/sys/arch/pmax/conf/GENERIC:1.190 Tue Dec 13 20:42:19 2016
+++ src/sys/arch/pmax/conf/GENERIC Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.190 2016/12/13 20:42:19 christos Exp $
+# $NetBSD: GENERIC,v 1.190.8.1 2017/07/05 13:58:48 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.190 $"
+#ident "GENERIC-$Revision: 1.190.8.1 $"
maxusers 64
@@ -340,8 +340,8 @@ options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
-options PAX_ASLR_DEBUG=1 # PaX ASLR debug
+#options PAX_ASLR_DEBUG=1 # PaX ASLR debug
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
-options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+#options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.127 src/sys/arch/shark/conf/GENERIC:1.127.6.1
--- src/sys/arch/shark/conf/GENERIC:1.127 Fri Feb 17 18:07:51 2017
+++ src/sys/arch/shark/conf/GENERIC Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.127 2017/02/17 18:07:51 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.127.6.1 2017/07/05 13:58:48 martin 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.127 $"
+#ident "GENERIC-$Revision: 1.127.6.1 $"
# estimated number of users
maxusers 32
@@ -153,7 +153,7 @@ options MODULAR_DEFAULT_AUTOLOAD
#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 DDB # in-kernel debugger
makeoptions COPY_SYMTAB=1 # reserve symbol space for DDB
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.198 src/sys/arch/sparc64/conf/GENERIC:1.198.6.1
--- src/sys/arch/sparc64/conf/GENERIC:1.198 Sat Mar 25 13:24:08 2017
+++ src/sys/arch/sparc64/conf/GENERIC Wed Jul 5 13:58:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.198 2017/03/25 13:24:08 martin Exp $
+# $NetBSD: GENERIC,v 1.198.6.1 2017/07/05 13:58:48 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.198 $"
+#ident "GENERIC-$Revision: 1.198.6.1 $"
maxusers 64
@@ -100,7 +100,7 @@ options DDB_VERBOSE_HELP # enable verbo
## Adds code to the kernel that does internal consistency checks, and will
## cause the kernel to panic if corruption of internal data structures
## is detected.
-options DIAGNOSTIC # extra kernel sanity checking
+#options DIAGNOSTIC # extra kernel sanity checking
## Enable (possibly expensive) debugging code that may also display messages
## on the system console
@@ -1029,7 +1029,7 @@ pseudo-device nsmb # experimental - SMB
# drvctl - needed to show device dictionary via drvctl(8)
pseudo-device drvctl
-options PAX_ASLR_DEBUG=1 # PaX ASLR debug
+#options PAX_ASLR_DEBUG=1 # PaX ASLR debug
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
# XXX: there is no PLT format for sparc64 that cooperates with
# MPROTECT, so disable it for now
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.73 src/sys/arch/zaurus/conf/GENERIC:1.73.6.1
--- src/sys/arch/zaurus/conf/GENERIC:1.73 Mon Apr 3 00:11:45 2017
+++ src/sys/arch/zaurus/conf/GENERIC Wed Jul 5 13:58:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.73 2017/04/03 00:11:45 sevan Exp $
+# $NetBSD: GENERIC,v 1.73.6.1 2017/07/05 13:58:49 martin Exp $
#
# GENERIC machine description file
#
@@ -164,7 +164,7 @@ options WSDISPLAY_COMPAT_RAWKBD # can
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options VERBOSE_INIT_ARM # verbose bootstraping messages
options DDB # in-kernel debugger
