Module Name: src
Committed By: martin
Date: Thu Nov 21 18:18:00 UTC 2019
Modified Files:
src/lib/libc [netbsd-9]: Makefile.inc
src/sys/arch/amd64/conf [netbsd-9]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/cobalt/conf [netbsd-9]: GENERIC
src/sys/arch/evbarm/conf [netbsd-9]: ADI_BRH ARMADAXP ARMADILLO-IOT-G3
ARMADILLO9 CP3100 CUBOX CUBOX-I GEMINI GEMINI_MASTER GEMINI_SLAVE
GENERIC.common HAWK HPT5325 IGEPV2 IMX6UL-STARTER IQ31244 IQ80310
IQ80321 IXDP425 LUBBOCK N900 OMAP5EVM OSK5912 PANDABOARD SMDK2800
TEAMASA_NPWR TEAMASA_NPWR_FC TISDP2420 TISDP2430 TS7200 TWINTAIL
VIPER ZAO425
src/sys/arch/i386/conf [netbsd-9]: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU
src/sys/arch/mvmeppc/conf [netbsd-9]: GENERIC
src/sys/arch/pmax/conf [netbsd-9]: GENERIC
src/sys/arch/shark/conf [netbsd-9]: GENERIC
src/sys/arch/sparc64/conf [netbsd-9]: GENERIC
src/sys/arch/zaurus/conf [netbsd-9]: GENERIC
src/sys/modules [netbsd-9]: Makefile.inc
Log Message:
In preparation for the upcoming release, turn off DIAGNOSTIC in most
kernel configs, modules and libc.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.4.1 src/lib/libc/Makefile.inc
cvs rdiff -u -r1.531.2.3 -r1.531.2.4 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.167.2.1 -r1.167.2.2 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.162 -r1.162.2.1 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.73 -r1.73.8.1 src/sys/arch/evbarm/conf/ADI_BRH
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/arch/evbarm/conf/ARMADAXP
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.60 -r1.60.4.1 src/sys/arch/evbarm/conf/ARMADILLO9
cvs rdiff -u -r1.48 -r1.48.4.1 src/sys/arch/evbarm/conf/CP3100
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/evbarm/conf/CUBOX
cvs rdiff -u -r1.22.2.1 -r1.22.2.2 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.38 -r1.38.4.1 src/sys/arch/evbarm/conf/GEMINI \
src/sys/arch/evbarm/conf/GEMINI_SLAVE
cvs rdiff -u -r1.37 -r1.37.4.1 src/sys/arch/evbarm/conf/GEMINI_MASTER
cvs rdiff -u -r1.34 -r1.34.2.1 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/evbarm/conf/HAWK
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/arch/evbarm/conf/IGEPV2
cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/arch/evbarm/conf/IMX6UL-STARTER
cvs rdiff -u -r1.74 -r1.74.4.1 src/sys/arch/evbarm/conf/IQ31244 \
src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.91 -r1.91.8.1 src/sys/arch/evbarm/conf/IQ80310
cvs rdiff -u -r1.89 -r1.89.4.1 src/sys/arch/evbarm/conf/IQ80321
cvs rdiff -u -r1.56 -r1.56.4.1 src/sys/arch/evbarm/conf/IXDP425
cvs rdiff -u -r1.60 -r1.60.8.1 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/arch/evbarm/conf/N900
cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/arch/evbarm/conf/OMAP5EVM
cvs rdiff -u -r1.33 -r1.33.4.1 src/sys/arch/evbarm/conf/OSK5912
cvs rdiff -u -r1.29.2.1 -r1.29.2.2 src/sys/arch/evbarm/conf/PANDABOARD
cvs rdiff -u -r1.61 -r1.61.4.1 src/sys/arch/evbarm/conf/SMDK2800
cvs rdiff -u -r1.95 -r1.95.4.1 src/sys/arch/evbarm/conf/TEAMASA_NPWR
cvs rdiff -u -r1.53 -r1.53.4.1 src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
cvs rdiff -u -r1.40 -r1.40.4.1 src/sys/arch/evbarm/conf/TISDP2420
cvs rdiff -u -r1.39 -r1.39.4.1 src/sys/arch/evbarm/conf/TISDP2430
cvs rdiff -u -r1.73 -r1.73.4.1 src/sys/arch/evbarm/conf/TS7200
cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/arch/evbarm/conf/VIPER
cvs rdiff -u -r1.64 -r1.64.4.1 src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.1208.2.1 -r1.1208.2.2 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.13.4.1 -r1.13.4.2 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/i386/conf/XEN3PAE_DOMU
cvs rdiff -u -r1.28 -r1.28.4.1 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.199 -r1.199.2.1 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.133 -r1.133.2.1 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.216 -r1.216.2.1 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.86.2.2 -r1.86.2.3 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/modules/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile.inc
diff -u src/lib/libc/Makefile.inc:1.19 src/lib/libc/Makefile.inc:1.19.4.1
--- src/lib/libc/Makefile.inc:1.19 Sat Jun 9 22:41:55 2018
+++ src/lib/libc/Makefile.inc Thu Nov 21 18:17:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.19 2018/06/09 22:41:55 christos Exp $
+# $NetBSD: Makefile.inc,v 1.19.4.1 2019/11/21 18:17:58 martin Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -30,7 +30,7 @@ RUMPRUN?= no
WARNS=5
CPPFLAGS+= -D_LIBC -DLIBC_SCCS -DSYSLIBC_SCCS -D_REENTRANT
-CPPFLAGS+= -D_DIAGNOSTIC
+#CPPFLAGS+= -D_DIAGNOSTIC
.if defined(MLIBDIR)
CPPFLAGS+= -DMLIBDIR=\"${MLIBDIR}\"
.endif
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.531.2.3 src/sys/arch/amd64/conf/GENERIC:1.531.2.4
--- src/sys/arch/amd64/conf/GENERIC:1.531.2.3 Tue Oct 15 18:10:09 2019
+++ src/sys/arch/amd64/conf/GENERIC Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.531.2.3 2019/10/15 18:10:09 martin Exp $
+# $NetBSD: GENERIC,v 1.531.2.4 2019/11/21 18:17:59 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.531.2.3 $"
+#ident "GENERIC-$Revision: 1.531.2.4 $"
maxusers 64 # estimated number of users
@@ -98,7 +98,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
@@ -1174,6 +1174,6 @@ include "dev/veriexec.config"
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.167.2.1 src/sys/arch/amd64/conf/XEN3_DOM0:1.167.2.2
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.167.2.1 Fri Aug 9 15:59:52 2019
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.167.2.1 2019/08/09 15:59:52 martin Exp $
+# $NetBSD: XEN3_DOM0,v 1.167.2.2 2019/11/21 18:17:59 martin Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.167.2.1 $"
+#ident "XEN3_DOM0-$Revision: 1.167.2.2 $"
maxusers 32 # estimated number of users
@@ -55,7 +55,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.89 src/sys/arch/amd64/conf/XEN3_DOMU:1.89.2.1
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.89 Mon May 6 02:24:37 2019
+++ src/sys/arch/amd64/conf/XEN3_DOMU Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.89 2019/05/06 02:24:37 sevan Exp $
+# $NetBSD: XEN3_DOMU,v 1.89.2.1 2019/11/21 18:17:59 martin Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOMU-$Revision: 1.89 $"
+#ident "XEN3_DOMU-$Revision: 1.89.2.1 $"
maxusers 32 # estimated number of users
@@ -47,7 +47,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.162 src/sys/arch/cobalt/conf/GENERIC:1.162.2.1
--- src/sys/arch/cobalt/conf/GENERIC:1.162 Fri Apr 26 21:40:29 2019
+++ src/sys/arch/cobalt/conf/GENERIC Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.162 2019/04/26 21:40:29 sevan Exp $
+# $NetBSD: GENERIC,v 1.162.2.1 2019/11/21 18:17:59 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.162 $"
+#ident "GENERIC-$Revision: 1.162.2.1 $"
maxusers 32
@@ -42,8 +42,8 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Debugging options
-options DIAGNOSTIC # extra kernel sanity checking
-options DEBUG # extra kernel debugging support
+#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
makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/evbarm/conf/ADI_BRH
diff -u src/sys/arch/evbarm/conf/ADI_BRH:1.73 src/sys/arch/evbarm/conf/ADI_BRH:1.73.8.1
--- src/sys/arch/evbarm/conf/ADI_BRH:1.73 Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/ADI_BRH Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ADI_BRH,v 1.73 2017/09/14 07:58:40 mrg Exp $
+# $NetBSD: ADI_BRH,v 1.73.8.1 2019/11/21 18:17:59 martin Exp $
#
# ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
#
@@ -109,7 +109,7 @@ options MIIVERBOSE # Verbose MII autoco
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/ARMADAXP
diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.26 src/sys/arch/evbarm/conf/ARMADAXP:1.26.4.1
--- src/sys/arch/evbarm/conf/ARMADAXP:1.26 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/ARMADAXP Thu Nov 21 18:17:59 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: ARMADAXP,v 1.26 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: ARMADAXP,v 1.26.4.1 2019/11/21 18:17:59 martin Exp $
#
# ARMADA XP DEV BOARD
#
@@ -112,7 +112,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
options LOCKDEBUG
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options PMAPCOUNTERS
Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.19 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.19.2.1
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.19 Wed Jul 24 12:33:18 2019
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.19 2019/07/24 12:33:18 hkenken Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.19.2.1 2019/11/21 18:17:59 martin Exp $
#
# ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
#
@@ -49,7 +49,7 @@ options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options VERBOSE_INIT_ARM # verbose bootstraping messages
-options DIAGNOSTIC # internally consistency checks
+#options DIAGNOSTIC # internally consistency checks
# XXX to be commented out on release branch/
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.60 src/sys/arch/evbarm/conf/ARMADILLO9:1.60.4.1
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.60 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/evbarm/conf/ARMADILLO9 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.60 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: ARMADILLO9,v 1.60.4.1 2019/11/21 18:17:59 martin Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -104,7 +104,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/CP3100
diff -u src/sys/arch/evbarm/conf/CP3100:1.48 src/sys/arch/evbarm/conf/CP3100:1.48.4.1
--- src/sys/arch/evbarm/conf/CP3100:1.48 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/evbarm/conf/CP3100 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CP3100,v 1.48 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: CP3100,v 1.48.4.1 2019/11/21 18:17:59 martin Exp $
#
# CP3100 -- Certance CP3100 Kernel
#
@@ -107,7 +107,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.14 src/sys/arch/evbarm/conf/CUBOX:1.14.2.1
--- src/sys/arch/evbarm/conf/CUBOX:1.14 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/evbarm/conf/CUBOX Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.14 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: CUBOX,v 1.14.2.1 2019/11/21 18:17:59 martin Exp $
#
# CUBOX -- SolidRun Ltd. Cubox kernel
#
@@ -48,7 +48,7 @@ options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
#options VERBOSE_INIT_ARM # verbose bootstraping messages
-options DIAGNOSTIC # internally consistency checks
+#options DIAGNOSTIC # internally consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.22.2.1 src/sys/arch/evbarm/conf/CUBOX-I:1.22.2.2
--- src/sys/arch/evbarm/conf/CUBOX-I:1.22.2.1 Thu Aug 15 09:49:49 2019
+++ src/sys/arch/evbarm/conf/CUBOX-I Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.22.2.1 2019/08/15 09:49:49 martin Exp $
+# $NetBSD: CUBOX-I,v 1.22.2.2 2019/11/21 18:17:59 martin Exp $
#
# CuBox-i
# - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -47,7 +47,7 @@ options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options VERBOSE_INIT_ARM # verbose bootstraping messages
-options DIAGNOSTIC # internally consistency checks
+#options DIAGNOSTIC # internally consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
Index: src/sys/arch/evbarm/conf/GEMINI
diff -u src/sys/arch/evbarm/conf/GEMINI:1.38 src/sys/arch/evbarm/conf/GEMINI:1.38.4.1
--- src/sys/arch/evbarm/conf/GEMINI:1.38 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/GEMINI Thu Nov 21 18:17:59 2019
@@ -97,7 +97,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/GEMINI_SLAVE
diff -u src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.38 src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.38.4.1
--- src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.38 Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/GEMINI_SLAVE Thu Nov 21 18:17:59 2019
@@ -97,7 +97,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/GEMINI_MASTER
diff -u src/sys/arch/evbarm/conf/GEMINI_MASTER:1.37 src/sys/arch/evbarm/conf/GEMINI_MASTER:1.37.4.1
--- src/sys/arch/evbarm/conf/GEMINI_MASTER:1.37 Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/GEMINI_MASTER Thu Nov 21 18:17:59 2019
@@ -98,7 +98,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.34 src/sys/arch/evbarm/conf/GENERIC.common:1.34.2.1
--- src/sys/arch/evbarm/conf/GENERIC.common:1.34 Sun Jul 21 17:05:11 2019
+++ src/sys/arch/evbarm/conf/GENERIC.common Thu Nov 21 18:17:59 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.common,v 1.34 2019/07/21 17:05:11 rin Exp $
+# $NetBSD: GENERIC.common,v 1.34.2.1 2019/11/21 18:17:59 martin Exp $
#
# GENERIC evbarm kernel config (template)
#
@@ -107,7 +107,7 @@ options BUFQ_PRIOCSCAN
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
options KDTRACE_HOOKS # kernel DTrace hooks
#options LOCKDEBUG
@@ -155,8 +155,8 @@ pseudo-device lockstat # lock profiling
include "dev/veriexec.config"
-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/evbarm/conf/HAWK
diff -u src/sys/arch/evbarm/conf/HAWK:1.8 src/sys/arch/evbarm/conf/HAWK:1.8.8.1
--- src/sys/arch/evbarm/conf/HAWK:1.8 Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/HAWK Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: HAWK,v 1.8 2017/09/14 07:58:40 mrg Exp $
+# $NetBSD: HAWK,v 1.8.8.1 2019/11/21 18:17:59 martin Exp $
#
# HAWK -- TI OMAPL138 based Board Kernel
#
@@ -89,7 +89,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PGALLOC_VERBOSE
#options DEBUG_DMA
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.42 src/sys/arch/evbarm/conf/HPT5325:1.42.2.1
--- src/sys/arch/evbarm/conf/HPT5325:1.42 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/evbarm/conf/HPT5325 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.42 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: HPT5325,v 1.42.2.1 2019/11/21 18:17:59 martin Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -130,7 +130,7 @@ options BUFQ_PRIOCSCAN
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IGEPV2
diff -u src/sys/arch/evbarm/conf/IGEPV2:1.35 src/sys/arch/evbarm/conf/IGEPV2:1.35.2.1
--- src/sys/arch/evbarm/conf/IGEPV2:1.35 Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/conf/IGEPV2 Thu Nov 21 18:17:59 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: IGEPV2,v 1.35 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: IGEPV2,v 1.35.2.1 2019/11/21 18:17:59 martin Exp $
#
# IGEPv2 -- TI OMAP 3530 Eval Board Kernel
#
@@ -109,7 +109,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options DDB # in-kernel debugger
Index: src/sys/arch/evbarm/conf/IMX6UL-STARTER
diff -u src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.13 src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.13.2.1
--- src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.13 Wed Jul 24 12:33:18 2019
+++ src/sys/arch/evbarm/conf/IMX6UL-STARTER Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: IMX6UL-STARTER,v 1.13 2019/07/24 12:33:18 hkenken Exp $
+# $NetBSD: IMX6UL-STARTER,v 1.13.2.1 2019/11/21 18:17:59 martin Exp $
#
# IMX6UL-STARTER - Freescale i.MX6UL Evaluation Board
#
@@ -48,7 +48,7 @@ options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options VERBOSE_INIT_ARM # verbose bootstraping messages
-options DIAGNOSTIC # internally consistency checks
+#options DIAGNOSTIC # internally consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
@@ -388,6 +388,6 @@ include "dev/veriexec.config"
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/evbarm/conf/IQ31244
diff -u src/sys/arch/evbarm/conf/IQ31244:1.74 src/sys/arch/evbarm/conf/IQ31244:1.74.4.1
--- src/sys/arch/evbarm/conf/IQ31244:1.74 Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/IQ31244 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: IQ31244,v 1.74 2018/07/12 10:46:43 maxv Exp $
+# $NetBSD: IQ31244,v 1.74.4.1 2019/11/21 18:17:59 martin Exp $
#
# IQ31244 -- Intel IQ31244 Evaluation Board Kernel
#
@@ -107,7 +107,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.74 src/sys/arch/evbarm/conf/TWINTAIL:1.74.4.1
--- src/sys/arch/evbarm/conf/TWINTAIL:1.74 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/TWINTAIL Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.74 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: TWINTAIL,v 1.74.4.1 2019/11/21 18:17:59 martin Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -106,7 +106,7 @@ options SCSIVERBOSE # Verbose SCSI erro
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IQ80310
diff -u src/sys/arch/evbarm/conf/IQ80310:1.91 src/sys/arch/evbarm/conf/IQ80310:1.91.8.1
--- src/sys/arch/evbarm/conf/IQ80310:1.91 Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/IQ80310 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: IQ80310,v 1.91 2017/09/14 07:58:40 mrg Exp $
+# $NetBSD: IQ80310,v 1.91.8.1 2019/11/21 18:17:59 martin Exp $
#
# IQ80310 -- Intel IQ80310 Evaluation Board Kernel
#
@@ -109,7 +109,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IQ80321
diff -u src/sys/arch/evbarm/conf/IQ80321:1.89 src/sys/arch/evbarm/conf/IQ80321:1.89.4.1
--- src/sys/arch/evbarm/conf/IQ80321:1.89 Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/IQ80321 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: IQ80321,v 1.89 2018/07/12 10:46:43 maxv Exp $
+# $NetBSD: IQ80321,v 1.89.4.1 2019/11/21 18:17:59 martin Exp $
#
# IQ80321 -- Intel IQ80321 Evaluation Board Kernel
#
@@ -107,7 +107,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IXDP425
diff -u src/sys/arch/evbarm/conf/IXDP425:1.56 src/sys/arch/evbarm/conf/IXDP425:1.56.4.1
--- src/sys/arch/evbarm/conf/IXDP425:1.56 Wed Dec 12 06:29:36 2018
+++ src/sys/arch/evbarm/conf/IXDP425 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: IXDP425,v 1.56 2018/12/12 06:29:36 maxv Exp $
+# $NetBSD: IXDP425,v 1.56.4.1 2019/11/21 18:17:59 martin Exp $
#
# IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
#
@@ -112,7 +112,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/LUBBOCK
diff -u src/sys/arch/evbarm/conf/LUBBOCK:1.60 src/sys/arch/evbarm/conf/LUBBOCK:1.60.8.1
--- src/sys/arch/evbarm/conf/LUBBOCK:1.60 Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbarm/conf/LUBBOCK Thu Nov 21 18:17:59 2019
@@ -100,7 +100,7 @@ options PCMCIAVERBOSE # verbose PCMCIA
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/N900
diff -u src/sys/arch/evbarm/conf/N900:1.31 src/sys/arch/evbarm/conf/N900:1.31.2.1
--- src/sys/arch/evbarm/conf/N900:1.31 Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/conf/N900 Thu Nov 21 18:17:59 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: N900,v 1.31 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: N900,v 1.31.2.1 2019/11/21 18:17:59 martin Exp $
#
# N900 -- Nokia N900 Kernel
#
@@ -108,7 +108,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options LOCKDEBUG # expensive locking checks/support
#options PMAP_DEBUG # Enable pmap_debug_level code
Index: src/sys/arch/evbarm/conf/OMAP5EVM
diff -u src/sys/arch/evbarm/conf/OMAP5EVM:1.16 src/sys/arch/evbarm/conf/OMAP5EVM:1.16.2.1
--- src/sys/arch/evbarm/conf/OMAP5EVM:1.16 Sat May 18 08:49:23 2019
+++ src/sys/arch/evbarm/conf/OMAP5EVM Thu Nov 21 18:17:59 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: OMAP5EVM,v 1.16 2019/05/18 08:49:23 skrll Exp $
+# $NetBSD: OMAP5EVM,v 1.16.2.1 2019/11/21 18:17:59 martin Exp $
#
# PANDABOARD -- TI OMAP 4430 Eval Board Kernel
#
@@ -113,7 +113,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options DDB # in-kernel debugger
Index: src/sys/arch/evbarm/conf/OSK5912
diff -u src/sys/arch/evbarm/conf/OSK5912:1.33 src/sys/arch/evbarm/conf/OSK5912:1.33.4.1
--- src/sys/arch/evbarm/conf/OSK5912:1.33 Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/OSK5912 Thu Nov 21 18:17:59 2019
@@ -95,7 +95,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/PANDABOARD
diff -u src/sys/arch/evbarm/conf/PANDABOARD:1.29.2.1 src/sys/arch/evbarm/conf/PANDABOARD:1.29.2.2
--- src/sys/arch/evbarm/conf/PANDABOARD:1.29.2.1 Thu Aug 15 09:49:49 2019
+++ src/sys/arch/evbarm/conf/PANDABOARD Thu Nov 21 18:17:59 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: PANDABOARD,v 1.29.2.1 2019/08/15 09:49:49 martin Exp $
+# $NetBSD: PANDABOARD,v 1.29.2.2 2019/11/21 18:17:59 martin Exp $
#
# PANDABOARD -- TI OMAP 4430 Eval Board Kernel
#
@@ -111,7 +111,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options DDB # in-kernel debugger
Index: src/sys/arch/evbarm/conf/SMDK2800
diff -u src/sys/arch/evbarm/conf/SMDK2800:1.61 src/sys/arch/evbarm/conf/SMDK2800:1.61.4.1
--- src/sys/arch/evbarm/conf/SMDK2800:1.61 Wed Aug 1 20:04:11 2018
+++ src/sys/arch/evbarm/conf/SMDK2800 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2800,v 1.61 2018/08/01 20:04:11 maxv Exp $
+# $NetBSD: SMDK2800,v 1.61.4.1 2019/11/21 18:17:59 martin Exp $
#
# SMDK2800 -- Samsung's S3C2800 evaluation board.
#
@@ -111,7 +111,7 @@ options USERCONF # userconf(4) support
#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 VERBOSE_INIT_ARM # verbose bootstraping messages
#options KGDB
Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.95 src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.95.4.1
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.95 Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR,v 1.95 2018/07/12 10:46:43 maxv Exp $
+# $NetBSD: TEAMASA_NPWR,v 1.95.4.1 2019/11/21 18:17:59 martin Exp $
#
# TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
# server appliance.
@@ -115,7 +115,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.53 src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.53.4.1
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.53 Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR_FC,v 1.53 2018/07/12 10:46:43 maxv Exp $
+# $NetBSD: TEAMASA_NPWR_FC,v 1.53.4.1 2019/11/21 18:17:59 martin Exp $
#
# TeamASA NPWR-FC, i80321-based SBC
#
@@ -108,7 +108,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/TISDP2420
diff -u src/sys/arch/evbarm/conf/TISDP2420:1.40 src/sys/arch/evbarm/conf/TISDP2420:1.40.4.1
--- src/sys/arch/evbarm/conf/TISDP2420:1.40 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/TISDP2420 Thu Nov 21 18:17:59 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: TISDP2420,v 1.40 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: TISDP2420,v 1.40.4.1 2019/11/21 18:17:59 martin Exp $
#
# TISDP2420 -- TI OMAP 2420 Eval Board Kernel
#
@@ -107,7 +107,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/TISDP2430
diff -u src/sys/arch/evbarm/conf/TISDP2430:1.39 src/sys/arch/evbarm/conf/TISDP2430:1.39.4.1
--- src/sys/arch/evbarm/conf/TISDP2430:1.39 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/TISDP2430 Thu Nov 21 18:17:59 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: TISDP2430,v 1.39 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: TISDP2430,v 1.39.4.1 2019/11/21 18:17:59 martin Exp $
#
# TISDP2430 -- TI OMAP 2430 Eval Board Kernel
#
@@ -106,7 +106,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/TS7200
diff -u src/sys/arch/evbarm/conf/TS7200:1.73 src/sys/arch/evbarm/conf/TS7200:1.73.4.1
--- src/sys/arch/evbarm/conf/TS7200:1.73 Wed Feb 6 11:58:31 2019
+++ src/sys/arch/evbarm/conf/TS7200 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: TS7200,v 1.73 2019/02/06 11:58:31 rin Exp $
+# $NetBSD: TS7200,v 1.73.4.1 2019/11/21 18:17:59 martin Exp $
#
# TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
#
@@ -111,7 +111,7 @@ options IRQSTATS # manage IRQ statistic
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/VIPER
diff -u src/sys/arch/evbarm/conf/VIPER:1.42 src/sys/arch/evbarm/conf/VIPER:1.42.4.1
--- src/sys/arch/evbarm/conf/VIPER:1.42 Thu Jul 12 10:46:43 2018
+++ src/sys/arch/evbarm/conf/VIPER Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: VIPER,v 1.42 2018/07/12 10:46:43 maxv Exp $
+# $NetBSD: VIPER,v 1.42.4.1 2019/11/21 18:17:59 martin Exp $
#
# Arcom Viper
#
@@ -101,7 +101,7 @@ options IRQSTATS # manage IRQ statistic
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/ZAO425
diff -u src/sys/arch/evbarm/conf/ZAO425:1.64 src/sys/arch/evbarm/conf/ZAO425:1.64.4.1
--- src/sys/arch/evbarm/conf/ZAO425:1.64 Wed Dec 12 06:29:36 2018
+++ src/sys/arch/evbarm/conf/ZAO425 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ZAO425,v 1.64 2018/12/12 06:29:36 maxv Exp $
+# $NetBSD: ZAO425,v 1.64.4.1 2019/11/21 18:17:59 martin Exp $
#
# ZAO425 -- Intel IXP425
#
@@ -112,7 +112,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1208.2.1 src/sys/arch/i386/conf/GENERIC:1.1208.2.2
--- src/sys/arch/i386/conf/GENERIC:1.1208.2.1 Fri Aug 9 15:59:52 2019
+++ src/sys/arch/i386/conf/GENERIC Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1208.2.1 2019/08/09 15:59:52 martin Exp $
+# $NetBSD: GENERIC,v 1.1208.2.2 2019/11/21 18:17:59 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.1208.2.1 $"
+#ident "GENERIC-$Revision: 1.1208.2.2 $"
maxusers 64 # estimated number of users
@@ -109,7 +109,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
@@ -1506,8 +1506,8 @@ pseudo-device drvctl
include "dev/veriexec.config"
-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/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.13.4.1 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.13.4.2
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.13.4.1 Fri Aug 9 15:59:52 2019
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.13.4.1 2019/08/09 15:59:52 martin Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.13.4.2 2019/11/21 18:17:59 martin Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -69,7 +69,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/XEN3PAE_DOMU
diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.6 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.6.4.1
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.6 Mon Feb 11 14:59:32 2019
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.6 2019/02/11 14:59:32 cherry Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.6.4.1 2019/11/21 18:17:59 martin Exp $
include "arch/xen/conf/std.xen"
@@ -53,7 +53,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/mvmeppc/conf/GENERIC
diff -u src/sys/arch/mvmeppc/conf/GENERIC:1.28 src/sys/arch/mvmeppc/conf/GENERIC:1.28.4.1
--- src/sys/arch/mvmeppc/conf/GENERIC:1.28 Wed Aug 1 20:04:12 2018
+++ src/sys/arch/mvmeppc/conf/GENERIC Thu Nov 21 18:17:59 2019
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.28 2018/08/01 20:04:12 maxv Exp $
+# $NetBSD: GENERIC,v 1.28.4.1 2019/11/21 18:17:59 martin Exp $
#
include "arch/mvmeppc/conf/std.mvmeppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.28 $"
+ident "GENERIC-$Revision: 1.28.4.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.199 src/sys/arch/pmax/conf/GENERIC:1.199.2.1
--- src/sys/arch/pmax/conf/GENERIC:1.199 Fri Apr 26 21:40:31 2019
+++ src/sys/arch/pmax/conf/GENERIC Thu Nov 21 18:18:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.199 2019/04/26 21:40:31 sevan Exp $
+# $NetBSD: GENERIC,v 1.199.2.1 2019/11/21 18:18:00 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.199 $"
+#ident "GENERIC-$Revision: 1.199.2.1 $"
maxusers 64
@@ -308,8 +308,8 @@ pseudo-device wsmux # wsmux control de
include "dev/veriexec.config"
-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.133 src/sys/arch/shark/conf/GENERIC:1.133.2.1
--- src/sys/arch/shark/conf/GENERIC:1.133 Fri Apr 26 21:40:32 2019
+++ src/sys/arch/shark/conf/GENERIC Thu Nov 21 18:18:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.133 2019/04/26 21:40:32 sevan Exp $
+# $NetBSD: GENERIC,v 1.133.2.1 2019/11/21 18:18:00 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.133 $"
+#ident "GENERIC-$Revision: 1.133.2.1 $"
# estimated number of users
maxusers 32
@@ -143,7 +143,7 @@ options BUFQ_PRIOCSCAN
#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.216 src/sys/arch/sparc64/conf/GENERIC:1.216.2.1
--- src/sys/arch/sparc64/conf/GENERIC:1.216 Mon May 6 02:24:37 2019
+++ src/sys/arch/sparc64/conf/GENERIC Thu Nov 21 18:18:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.216 2019/05/06 02:24:37 sevan Exp $
+# $NetBSD: GENERIC,v 1.216.2.1 2019/11/21 18:18:00 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.216 $"
+#ident "GENERIC-$Revision: 1.216.2.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
@@ -964,7 +964,7 @@ pseudo-device drvctl
include "dev/veriexec.config"
-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.86.2.2 src/sys/arch/zaurus/conf/GENERIC:1.86.2.3
--- src/sys/arch/zaurus/conf/GENERIC:1.86.2.2 Sat Nov 16 16:59:15 2019
+++ src/sys/arch/zaurus/conf/GENERIC Thu Nov 21 18:18:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.86.2.2 2019/11/16 16:59:15 martin Exp $
+# $NetBSD: GENERIC,v 1.86.2.3 2019/11/21 18:18:00 martin Exp $
#
# GENERIC machine description file
#
@@ -147,7 +147,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
Index: src/sys/modules/Makefile.inc
diff -u src/sys/modules/Makefile.inc:1.8 src/sys/modules/Makefile.inc:1.8.4.1
--- src/sys/modules/Makefile.inc:1.8 Sun Feb 17 04:05:41 2019
+++ src/sys/modules/Makefile.inc Thu Nov 21 18:17:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2019/02/17 04:05:41 rin Exp $
+# $NetBSD: Makefile.inc,v 1.8.4.1 2019/11/21 18:17:59 martin Exp $
S!= cd ${.PARSEDIR}/..;pwd
CPPFLAGS+= -I${NETBSDSRCDIR}/common/include
@@ -7,7 +7,7 @@ WARNS?= 5
# inexpensive kernel consistency checks
# XXX to be commented out on release branch
-CPPFLAGS+= -DDIAGNOSTIC
+# CPPFLAGS+= -DDIAGNOSTIC
.if !empty(IOCONF)
_BSD_IOCONF_MK_USER_=1
