Module Name: src
Committed By: snj
Date: Mon Oct 9 23:33:47 UTC 2023
Modified Files:
src/lib/libc [netbsd-10]: Makefile.inc
src/sys/arch/amd64/conf [netbsd-10]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/cobalt/conf [netbsd-10]: GENERIC
src/sys/arch/evbarm/conf [netbsd-10]: ADI_BRH ARMADAXP ARMADILLO9
BCM5301X BCM56340 CP3100 CUBOX DNS323 GEMINI GEMINI_MASTER
GEMINI_SLAVE GENERIC.common GUMSTIX HPT5325 IMX31LITE IQ31244
IQ80310 IQ80321 IXDP425 IXM1200 KUROBOX_PRO KURONAS_X4 LUBBOCK
MMNET_GENERIC MPCSA_GENERIC NSLU2 OPENBLOCKS_A6 OPENBLOCKS_AX3
SHEEVAPLUG SMDK2800 TEAMASA_NPWR TEAMASA_NPWR_FC TS7200 TWINTAIL
VIPER ZAO425
src/sys/arch/i386/conf [netbsd-10]: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU
src/sys/arch/mvmeppc/conf [netbsd-10]: GENERIC
src/sys/arch/pmax/conf [netbsd-10]: GENERIC
src/sys/arch/shark/conf [netbsd-10]: GENERIC OFWGENCFG
src/sys/arch/sparc/conf [netbsd-10]: GENERIC
src/sys/arch/sparc64/conf [netbsd-10]: GENERIC
src/sys/arch/zaurus/conf [netbsd-10]: GENERIC
src/sys/modules [netbsd-10]: Makefile.inc
Log Message:
Apply patch (requested by martin in ticket #401):
Disable DIAGNOSTIC/DEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.6.1 src/lib/libc/Makefile.inc
cvs rdiff -u -r1.599.4.3 -r1.599.4.4 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.197.4.1 -r1.197.4.2 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.99 -r1.99.4.1 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.172 -r1.172.4.1 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.75 -r1.75.4.1 src/sys/arch/evbarm/conf/ADI_BRH \
src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.29 -r1.29.4.1 src/sys/arch/evbarm/conf/ARMADAXP
cvs rdiff -u -r1.67 -r1.67.4.1 src/sys/arch/evbarm/conf/ARMADILLO9
cvs rdiff -u -r1.39 -r1.39.4.1 src/sys/arch/evbarm/conf/BCM5301X \
src/sys/arch/evbarm/conf/GEMINI_MASTER
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/evbarm/conf/BCM56340
cvs rdiff -u -r1.52 -r1.52.4.1 src/sys/arch/evbarm/conf/CP3100
cvs rdiff -u -r1.21 -r1.21.4.1 src/sys/arch/evbarm/conf/CUBOX
cvs rdiff -u -r1.14 -r1.14.20.1 src/sys/arch/evbarm/conf/DNS323
cvs rdiff -u -r1.40 -r1.40.4.1 src/sys/arch/evbarm/conf/GEMINI \
src/sys/arch/evbarm/conf/GEMINI_SLAVE
cvs rdiff -u -r1.50.4.1 -r1.50.4.2 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.110 -r1.110.4.1 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.53 -r1.53.4.1 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.36 -r1.36.4.1 src/sys/arch/evbarm/conf/IMX31LITE \
src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.77 -r1.77.4.1 src/sys/arch/evbarm/conf/IQ31244
cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/arch/evbarm/conf/IQ80310
cvs rdiff -u -r1.91 -r1.91.4.1 src/sys/arch/evbarm/conf/IQ80321
cvs rdiff -u -r1.61 -r1.61.4.1 src/sys/arch/evbarm/conf/IXDP425
cvs rdiff -u -r1.66 -r1.66.4.1 src/sys/arch/evbarm/conf/IXM1200 \
src/sys/arch/evbarm/conf/SMDK2800
cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/arch/evbarm/conf/KUROBOX_PRO
cvs rdiff -u -r1.5 -r1.5.20.1 src/sys/arch/evbarm/conf/KURONAS_X4
cvs rdiff -u -r1.63 -r1.63.4.1 src/sys/arch/evbarm/conf/LUBBOCK
cvs rdiff -u -r1.55 -r1.55.4.1 src/sys/arch/evbarm/conf/MMNET_GENERIC \
src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
cvs rdiff -u -r1.76 -r1.76.4.1 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.50 -r1.50.4.1 src/sys/arch/evbarm/conf/NSLU2
cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.97 -r1.97.4.1 src/sys/arch/evbarm/conf/TEAMASA_NPWR
cvs rdiff -u -r1.78 -r1.78.4.1 src/sys/arch/evbarm/conf/TS7200
cvs rdiff -u -r1.85 -r1.85.4.1 src/sys/arch/evbarm/conf/TWINTAIL
cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/arch/evbarm/conf/VIPER
cvs rdiff -u -r1.69 -r1.69.4.1 src/sys/arch/evbarm/conf/ZAO425
cvs rdiff -u -r1.1243.2.1 -r1.1243.2.2 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.36 -r1.36.4.1 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.18 -r1.18.4.1 src/sys/arch/i386/conf/XEN3PAE_DOMU
cvs rdiff -u -r1.32 -r1.32.4.1 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.206 -r1.206.4.1 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.142 -r1.142.4.1 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.49 -r1.49.30.1 src/sys/arch/shark/conf/OFWGENCFG
cvs rdiff -u -r1.272 -r1.272.4.1 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.237 -r1.237.4.1 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.8 -r1.8.30.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.20 src/lib/libc/Makefile.inc:1.20.6.1
--- src/lib/libc/Makefile.inc:1.20 Tue Apr 20 21:42:31 2021
+++ src/lib/libc/Makefile.inc Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2021/04/20 21:42:31 christos Exp $
+# $NetBSD: Makefile.inc,v 1.20.6.1 2023/10/09 23:33:45 snj 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.599.4.3 src/sys/arch/amd64/conf/GENERIC:1.599.4.4
--- src/sys/arch/amd64/conf/GENERIC:1.599.4.3 Sun Oct 8 13:19:33 2023
+++ src/sys/arch/amd64/conf/GENERIC Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.599.4.3 2023/10/08 13:19:33 martin Exp $
+# $NetBSD: GENERIC,v 1.599.4.4 2023/10/09 23:33:45 snj 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.599.4.3 $"
+#ident "GENERIC-$Revision: 1.599.4.4 $"
maxusers 64 # estimated number of users
@@ -112,7 +112,7 @@ xbd* at xenbus? # Xen virtual block de
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
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.197.4.1 src/sys/arch/amd64/conf/XEN3_DOM0:1.197.4.2
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.197.4.1 Sun Oct 8 13:19:33 2023
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.197.4.1 2023/10/08 13:19:33 martin Exp $
+# $NetBSD: XEN3_DOM0,v 1.197.4.2 2023/10/09 23:33:45 snj Exp $
# XEN3_DOM0 machine description file
#
@@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "XEN3_DOM0-$Revision: 1.197.4.1 $"
+#ident "XEN3_DOM0-$Revision: 1.197.4.2 $"
maxusers 32 # estimated number of users
@@ -107,7 +107,7 @@ powernow0 at cpu0 # AMD PowerNow! and C
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
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.99 src/sys/arch/amd64/conf/XEN3_DOMU:1.99.4.1
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.99 Sun Aug 7 02:52:23 2022
+++ src/sys/arch/amd64/conf/XEN3_DOMU Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.99 2022/08/07 02:52:23 simonb Exp $
+# $NetBSD: XEN3_DOMU,v 1.99.4.1 2023/10/09 23:33:45 snj 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.99 $"
+#ident "XEN3_DOMU-$Revision: 1.99.4.1 $"
maxusers 32 # estimated number of users
@@ -44,7 +44,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.172 src/sys/arch/cobalt/conf/GENERIC:1.172.4.1
--- src/sys/arch/cobalt/conf/GENERIC:1.172 Thu Sep 29 10:10:06 2022
+++ src/sys/arch/cobalt/conf/GENERIC Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.172 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.172.4.1 2023/10/09 23:33:45 snj 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.172 $"
+#ident "GENERIC-$Revision: 1.172.4.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/ADI_BRH
diff -u src/sys/arch/evbarm/conf/ADI_BRH:1.75 src/sys/arch/evbarm/conf/ADI_BRH:1.75.4.1
--- src/sys/arch/evbarm/conf/ADI_BRH:1.75 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/ADI_BRH Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ADI_BRH,v 1.75 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: ADI_BRH,v 1.75.4.1 2023/10/09 23:33:45 snj Exp $
#
# ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
#
@@ -111,7 +111,7 @@ options MIIVERBOSE # Verbose MII autoco
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.75 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.75.4.1
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.75 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.75 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: SHEEVAPLUG,v 1.75.4.1 2023/10/09 23:33:45 snj Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -128,8 +128,8 @@ options USBVERBOSE # verbose USB device
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options LOCKDEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/ARMADAXP
diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.29 src/sys/arch/evbarm/conf/ARMADAXP:1.29.4.1
--- src/sys/arch/evbarm/conf/ARMADAXP:1.29 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/ARMADAXP Mon Oct 9 23:33:45 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD: ARMADAXP,v 1.29 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: ARMADAXP,v 1.29.4.1 2023/10/09 23:33:45 snj Exp $
#
# ARMADA XP DEV BOARD
#
@@ -114,7 +114,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 UVMHIST # kernhist for uvm/pmap subsystems
#options PMAPCOUNTERS
Index: src/sys/arch/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.67 src/sys/arch/evbarm/conf/ARMADILLO9:1.67.4.1
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.67 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/ARMADILLO9 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.67 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: ARMADILLO9,v 1.67.4.1 2023/10/09 23:33:45 snj Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -102,7 +102,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/BCM5301X
diff -u src/sys/arch/evbarm/conf/BCM5301X:1.39 src/sys/arch/evbarm/conf/BCM5301X:1.39.4.1
--- src/sys/arch/evbarm/conf/BCM5301X:1.39 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/BCM5301X Mon Oct 9 23:33:45 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM5301X,v 1.39 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: BCM5301X,v 1.39.4.1 2023/10/09 23:33:45 snj Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -127,8 +127,8 @@ options RNDVERBOSE # Verbose rnd messag
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options LOCKDEBUG # Enable lock debugging
#options UVMHIST # kernhist for uvm/pmap subsystems
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.39 src/sys/arch/evbarm/conf/GEMINI_MASTER:1.39.4.1
--- src/sys/arch/evbarm/conf/GEMINI_MASTER:1.39 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/GEMINI_MASTER Mon Oct 9 23:33:45 2023
@@ -100,7 +100,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/BCM56340
diff -u src/sys/arch/evbarm/conf/BCM56340:1.22 src/sys/arch/evbarm/conf/BCM56340:1.22.4.1
--- src/sys/arch/evbarm/conf/BCM56340:1.22 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/BCM56340 Mon Oct 9 23:33:45 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM56340,v 1.22 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: BCM56340,v 1.22.4.1 2023/10/09 23:33:45 snj Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -127,8 +127,8 @@ options RNDVERBOSE # Verbose rnd messag
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options LOCKDEBUG # Enable lock debugging
#options UVMHIST # kernhist for uvm/pmap subsystems
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/CP3100
diff -u src/sys/arch/evbarm/conf/CP3100:1.52 src/sys/arch/evbarm/conf/CP3100:1.52.4.1
--- src/sys/arch/evbarm/conf/CP3100:1.52 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/CP3100 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CP3100,v 1.52 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: CP3100,v 1.52.4.1 2023/10/09 23:33:45 snj Exp $
#
# CP3100 -- Certance CP3100 Kernel
#
@@ -110,7 +110,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.21 src/sys/arch/evbarm/conf/CUBOX:1.21.4.1
--- src/sys/arch/evbarm/conf/CUBOX:1.21 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/CUBOX Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.21 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: CUBOX,v 1.21.4.1 2023/10/09 23:33:45 snj 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 UVMHIST # kernhist for uvm/pmap subsystems
Index: src/sys/arch/evbarm/conf/DNS323
diff -u src/sys/arch/evbarm/conf/DNS323:1.14 src/sys/arch/evbarm/conf/DNS323:1.14.20.1
--- src/sys/arch/evbarm/conf/DNS323:1.14 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/DNS323 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: DNS323,v 1.14 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: DNS323,v 1.14.20.1 2023/10/09 23:33:45 snj Exp $
#
# DNS323 -- D-Link. DNS-323 platform kernel
#
@@ -14,8 +14,8 @@ no options CPU_SHEEVA
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
#options DDB # in-kernel debugger
Index: src/sys/arch/evbarm/conf/GEMINI
diff -u src/sys/arch/evbarm/conf/GEMINI:1.40 src/sys/arch/evbarm/conf/GEMINI:1.40.4.1
--- src/sys/arch/evbarm/conf/GEMINI:1.40 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/GEMINI Mon Oct 9 23:33:45 2023
@@ -99,7 +99,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
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.40 src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.40.4.1
--- src/sys/arch/evbarm/conf/GEMINI_SLAVE:1.40 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/GEMINI_SLAVE Mon Oct 9 23:33:45 2023
@@ -99,7 +99,7 @@ options KTRACE # system call tracing,
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#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.50.4.1 src/sys/arch/evbarm/conf/GENERIC.common:1.50.4.2
--- src/sys/arch/evbarm/conf/GENERIC.common:1.50.4.1 Wed Feb 8 16:38:01 2023
+++ src/sys/arch/evbarm/conf/GENERIC.common Mon Oct 9 23:33:45 2023
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC.common,v 1.50.4.1 2023/02/08 16:38:01 martin Exp $
+# $NetBSD: GENERIC.common,v 1.50.4.2 2023/10/09 23:33:45 snj Exp $
#
# GENERIC evbarm kernel config (template)
#
@@ -117,7 +117,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
Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.110 src/sys/arch/evbarm/conf/GUMSTIX:1.110.4.1
--- src/sys/arch/evbarm/conf/GUMSTIX:1.110 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/GUMSTIX Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.110 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: GUMSTIX,v 1.110.4.1 2023/10/09 23:33:45 snj Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -124,8 +124,8 @@ options MIIVERBOSE # Verbose MII autoco
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options LOCKDEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.53 src/sys/arch/evbarm/conf/HPT5325:1.53.4.1
--- src/sys/arch/evbarm/conf/HPT5325:1.53 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/HPT5325 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.53 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: HPT5325,v 1.53.4.1 2023/10/09 23:33:45 snj Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -125,7 +125,7 @@ options BUFQ_PRIOCSCAN
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IMX31LITE
diff -u src/sys/arch/evbarm/conf/IMX31LITE:1.36 src/sys/arch/evbarm/conf/IMX31LITE:1.36.4.1
--- src/sys/arch/evbarm/conf/IMX31LITE:1.36 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/IMX31LITE Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: IMX31LITE,v 1.36 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: IMX31LITE,v 1.36.4.1 2023/10/09 23:33:45 snj Exp $
#
# IMX31LITE -- Freescale IMX31LITE Evaluation Board Kernel
#
@@ -107,8 +107,8 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options LOCKDEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.36 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.36.4.1
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.36 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.36 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.36.4.1 2023/10/09 23:33:45 snj Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -130,8 +130,8 @@ options USBVERBOSE # Verbose USB device
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
options DDB # in-kernel debugger
Index: src/sys/arch/evbarm/conf/IQ31244
diff -u src/sys/arch/evbarm/conf/IQ31244:1.77 src/sys/arch/evbarm/conf/IQ31244:1.77.4.1
--- src/sys/arch/evbarm/conf/IQ31244:1.77 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/IQ31244 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: IQ31244,v 1.77 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: IQ31244,v 1.77.4.1 2023/10/09 23:33:45 snj Exp $
#
# IQ31244 -- Intel IQ31244 Evaluation Board Kernel
#
@@ -110,7 +110,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IQ80310
diff -u src/sys/arch/evbarm/conf/IQ80310:1.93 src/sys/arch/evbarm/conf/IQ80310:1.93.4.1
--- src/sys/arch/evbarm/conf/IQ80310:1.93 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/IQ80310 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: IQ80310,v 1.93 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: IQ80310,v 1.93.4.1 2023/10/09 23:33:45 snj Exp $
#
# IQ80310 -- Intel IQ80310 Evaluation Board Kernel
#
@@ -111,7 +111,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IQ80321
diff -u src/sys/arch/evbarm/conf/IQ80321:1.91 src/sys/arch/evbarm/conf/IQ80321:1.91.4.1
--- src/sys/arch/evbarm/conf/IQ80321:1.91 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/IQ80321 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: IQ80321,v 1.91 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: IQ80321,v 1.91.4.1 2023/10/09 23:33:45 snj Exp $
#
# IQ80321 -- Intel IQ80321 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 UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IXDP425
diff -u src/sys/arch/evbarm/conf/IXDP425:1.61 src/sys/arch/evbarm/conf/IXDP425:1.61.4.1
--- src/sys/arch/evbarm/conf/IXDP425:1.61 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/IXDP425 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: IXDP425,v 1.61 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: IXDP425,v 1.61.4.1 2023/10/09 23:33:45 snj Exp $
#
# IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
#
@@ -114,7 +114,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/IXM1200
diff -u src/sys/arch/evbarm/conf/IXM1200:1.66 src/sys/arch/evbarm/conf/IXM1200:1.66.4.1
--- src/sys/arch/evbarm/conf/IXM1200:1.66 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/IXM1200 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: IXM1200,v 1.66 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: IXM1200,v 1.66.4.1 2023/10/09 23:33:45 snj Exp $
#
# IXM1200 -- Intel IXM1200 Evaluation Board Kernel
#
@@ -108,8 +108,8 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
options VERBOSE_INIT_ARM # verbose bootstraping messages
options DDB # in-kernel debugger
Index: src/sys/arch/evbarm/conf/SMDK2800
diff -u src/sys/arch/evbarm/conf/SMDK2800:1.66 src/sys/arch/evbarm/conf/SMDK2800:1.66.4.1
--- src/sys/arch/evbarm/conf/SMDK2800:1.66 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/SMDK2800 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2800,v 1.66 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: SMDK2800,v 1.66.4.1 2023/10/09 23:33:45 snj Exp $
#
# SMDK2800 -- Samsung's S3C2800 evaluation board.
#
@@ -113,7 +113,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 UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
#options KGDB
Index: src/sys/arch/evbarm/conf/KUROBOX_PRO
diff -u src/sys/arch/evbarm/conf/KUROBOX_PRO:1.15 src/sys/arch/evbarm/conf/KUROBOX_PRO:1.15.4.1
--- src/sys/arch/evbarm/conf/KUROBOX_PRO:1.15 Mon Aug 30 01:29:41 2021
+++ src/sys/arch/evbarm/conf/KUROBOX_PRO Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: KUROBOX_PRO,v 1.15 2021/08/30 01:29:41 rin Exp $
+# $NetBSD: KUROBOX_PRO,v 1.15.4.1 2023/10/09 23:33:45 snj Exp $
#
# KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
#
@@ -18,8 +18,8 @@ config netbsd-wd0 root on wd0 type ffs
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
Index: src/sys/arch/evbarm/conf/KURONAS_X4
diff -u src/sys/arch/evbarm/conf/KURONAS_X4:1.5 src/sys/arch/evbarm/conf/KURONAS_X4:1.5.20.1
--- src/sys/arch/evbarm/conf/KURONAS_X4:1.5 Sat Apr 18 11:00:38 2020
+++ src/sys/arch/evbarm/conf/KURONAS_X4 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: KURONAS_X4,v 1.5 2020/04/18 11:00:38 skrll Exp $
+# $NetBSD: KURONAS_X4,v 1.5.20.1 2023/10/09 23:33:45 snj Exp $
#
# KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
#
@@ -18,8 +18,8 @@ config netbsd-wd0 root on wd0 type ffs
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
Index: src/sys/arch/evbarm/conf/LUBBOCK
diff -u src/sys/arch/evbarm/conf/LUBBOCK:1.63 src/sys/arch/evbarm/conf/LUBBOCK:1.63.4.1
--- src/sys/arch/evbarm/conf/LUBBOCK:1.63 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/LUBBOCK Mon Oct 9 23:33:45 2023
@@ -102,7 +102,7 @@ options PCMCIAVERBOSE # verbose PCMCIA
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.55 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.55.4.1
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.55 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.55 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: MMNET_GENERIC,v 1.55.4.1 2023/10/09 23:33:45 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.55 $"
+#ident "GENERIC-$Revision: 1.55.4.1 $"
maxusers 32 # estimated number of users
@@ -73,8 +73,8 @@ options SYSCTL_INCLUDE_DESCR # Include
#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
-options DEBUG # expensive debugging checks/support
+#options DIAGNOSTIC # expensive kernel consistency checks
+#options DEBUG # expensive debugging checks/support
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.55 src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.55.4.1
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC:1.55 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR_FC Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR_FC,v 1.55 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: TEAMASA_NPWR_FC,v 1.55.4.1 2023/10/09 23:33:45 snj Exp $
#
# TeamASA NPWR-FC, i80321-based SBC
#
@@ -110,7 +110,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.76 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.76.4.1
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.76 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.76 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.76.4.1 2023/10/09 23:33:45 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.76 $"
+#ident "GENERIC-$Revision: 1.76.4.1 $"
maxusers 32 # estimated number of users
@@ -73,8 +73,8 @@ options SYSCTL_INCLUDE_DESCR # Include
#options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
-options DEBUG # expensive debugging checks/support
+#options DIAGNOSTIC # expensive kernel consistency checks
+#options DEBUG # expensive debugging checks/support
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
Index: src/sys/arch/evbarm/conf/NSLU2
diff -u src/sys/arch/evbarm/conf/NSLU2:1.50 src/sys/arch/evbarm/conf/NSLU2:1.50.4.1
--- src/sys/arch/evbarm/conf/NSLU2:1.50 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/NSLU2 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: NSLU2,v 1.50 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: NSLU2,v 1.50.4.1 2023/10/09 23:33:45 snj Exp $
#
# Linksys NSLU2 "Slug" NAS Device
#
@@ -112,8 +112,8 @@ options CONUNIT=0 # Console port numbe
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
options DDB # in-kernel debugger
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.45 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.45.4.1
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.45 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_A6,v 1.45 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: OPENBLOCKS_A6,v 1.45.4.1 2023/10/09 23:33:45 snj Exp $
#
# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
@@ -118,8 +118,8 @@ options USBVERBOSE # Verbose USB device
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
-options DEBUG
+#options DIAGNOSTIC # internal consistency checks
+#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
options DDB # in-kernel debugger
Index: src/sys/arch/evbarm/conf/TEAMASA_NPWR
diff -u src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.97 src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.97.4.1
--- src/sys/arch/evbarm/conf/TEAMASA_NPWR:1.97 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/TEAMASA_NPWR Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR,v 1.97 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: TEAMASA_NPWR,v 1.97.4.1 2023/10/09 23:33:45 snj Exp $
#
# TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
# server appliance.
@@ -117,7 +117,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/TS7200
diff -u src/sys/arch/evbarm/conf/TS7200:1.78 src/sys/arch/evbarm/conf/TS7200:1.78.4.1
--- src/sys/arch/evbarm/conf/TS7200:1.78 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/TS7200 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: TS7200,v 1.78 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: TS7200,v 1.78.4.1 2023/10/09 23:33:45 snj Exp $
#
# TS7200 - Kernel for Technologic Systems TS7200 ARM hardware
#
@@ -113,7 +113,7 @@ options IRQSTATS # manage IRQ statistic
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/TWINTAIL
diff -u src/sys/arch/evbarm/conf/TWINTAIL:1.85 src/sys/arch/evbarm/conf/TWINTAIL:1.85.4.1
--- src/sys/arch/evbarm/conf/TWINTAIL:1.85 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/TWINTAIL Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: TWINTAIL,v 1.85 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: TWINTAIL,v 1.85.4.1 2023/10/09 23:33:45 snj Exp $
#
# TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
#
@@ -108,7 +108,7 @@ options SCSIVERBOSE # Verbose SCSI erro
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/VIPER
diff -u src/sys/arch/evbarm/conf/VIPER:1.44 src/sys/arch/evbarm/conf/VIPER:1.44.4.1
--- src/sys/arch/evbarm/conf/VIPER:1.44 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/VIPER Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: VIPER,v 1.44 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: VIPER,v 1.44.4.1 2023/10/09 23:33:45 snj Exp $
#
# Arcom Viper
#
@@ -103,7 +103,7 @@ options IRQSTATS # manage IRQ statistic
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/ZAO425
diff -u src/sys/arch/evbarm/conf/ZAO425:1.69 src/sys/arch/evbarm/conf/ZAO425:1.69.4.1
--- src/sys/arch/evbarm/conf/ZAO425:1.69 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/ZAO425 Mon Oct 9 23:33:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ZAO425,v 1.69 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: ZAO425,v 1.69.4.1 2023/10/09 23:33:45 snj Exp $
#
# ZAO425 -- Intel IXP425
#
@@ -114,7 +114,7 @@ options USERCONF # userconf(4) support
# Development and Debugging options
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options UVMHIST # kernhist for uvm/pmap subsystems
options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1243.2.1 src/sys/arch/i386/conf/GENERIC:1.1243.2.2
--- src/sys/arch/i386/conf/GENERIC:1.1243.2.1 Tue Aug 1 16:07:19 2023
+++ src/sys/arch/i386/conf/GENERIC Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1243.2.1 2023/08/01 16:07:19 martin Exp $
+# $NetBSD: GENERIC,v 1.1243.2.2 2023/10/09 23:33:46 snj 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.1243.2.1 $"
+#ident "GENERIC-$Revision: 1.1243.2.2 $"
maxusers 64 # estimated number of users
@@ -118,7 +118,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
Index: src/sys/arch/i386/conf/XEN3PAE_DOM0
diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.36 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.36.4.1
--- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.36 Sun Aug 7 02:52:26 2022
+++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.36 2022/08/07 02:52:26 simonb Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.36.4.1 2023/10/09 23:33:46 snj Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -67,7 +67,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.18 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.18.4.1
--- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.18 Sun Aug 7 02:52:26 2022
+++ src/sys/arch/i386/conf/XEN3PAE_DOMU Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.18 2022/08/07 02:52:26 simonb Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.18.4.1 2023/10/09 23:33:46 snj Exp $
include "arch/i386/conf/std.xen"
@@ -51,7 +51,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.32 src/sys/arch/mvmeppc/conf/GENERIC:1.32.4.1
--- src/sys/arch/mvmeppc/conf/GENERIC:1.32 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/mvmeppc/conf/GENERIC Mon Oct 9 23:33:46 2023
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.32 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.32.4.1 2023/10/09 23:33:46 snj Exp $
#
include "arch/mvmeppc/conf/std.mvmeppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.32 $"
+ident "GENERIC-$Revision: 1.32.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.206 src/sys/arch/pmax/conf/GENERIC:1.206.4.1
--- src/sys/arch/pmax/conf/GENERIC:1.206 Thu Sep 29 10:10:09 2022
+++ src/sys/arch/pmax/conf/GENERIC Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.206 2022/09/29 10:10:09 riastradh Exp $
+# $NetBSD: GENERIC,v 1.206.4.1 2023/10/09 23:33:46 snj 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.206 $"
+#ident "GENERIC-$Revision: 1.206.4.1 $"
maxusers 64
@@ -48,8 +48,8 @@ options DDB # in-kernel debugger
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
options DDB_ONPANIC=1 # don't enter debugger on panic
options DDB_COMMANDONENTER="trace;show registers"
-options DIAGNOSTIC # extra kernel debugging checks
-options DEBUG # extra kernel debugging support
+#options DIAGNOSTIC # extra kernel debugging checks
+#options DEBUG # extra kernel debugging support
#options LOCKDEBUG
#options VMFAULT_TRACE
#options PMAP_FAULTINFO
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.142 src/sys/arch/shark/conf/GENERIC:1.142.4.1
--- src/sys/arch/shark/conf/GENERIC:1.142 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/shark/conf/GENERIC Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.142 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.142.4.1 2023/10/09 23:33:46 snj 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.142 $"
+#ident "GENERIC-$Revision: 1.142.4.1 $"
# estimated number of users
maxusers 32
@@ -141,7 +141,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 UVMHIST # kernhist for uvm/pmap subsystems
options DDB # in-kernel debugger
makeoptions COPY_SYMTAB=1 # reserve symbol space for DDB
Index: src/sys/arch/shark/conf/OFWGENCFG
diff -u src/sys/arch/shark/conf/OFWGENCFG:1.49 src/sys/arch/shark/conf/OFWGENCFG:1.49.30.1
--- src/sys/arch/shark/conf/OFWGENCFG:1.49 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/shark/conf/OFWGENCFG Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: OFWGENCFG,v 1.49 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: OFWGENCFG,v 1.49.30.1 2023/10/09 23:33:46 snj Exp $
#
# OFWGENCFG: 'generic' configuration for Open Firmware boards.
#
@@ -91,7 +91,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 DDB # in-kernel debugger
pseudo-device ksyms
#makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.272 src/sys/arch/sparc/conf/GENERIC:1.272.4.1
--- src/sys/arch/sparc/conf/GENERIC:1.272 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/sparc/conf/GENERIC Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.272 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.272.4.1 2023/10/09 23:33:46 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.272 $"
+#ident "GENERIC-$Revision: 1.272.4.1 $"
maxusers 32
@@ -125,7 +125,7 @@ options DDB_HISTORY_SIZE=100 # enable h
## 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
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.237 src/sys/arch/sparc64/conf/GENERIC:1.237.4.1
--- src/sys/arch/sparc64/conf/GENERIC:1.237 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/sparc64/conf/GENERIC Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.237 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.237.4.1 2023/10/09 23:33:46 snj 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.237 $"
+#ident "GENERIC-$Revision: 1.237.4.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
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.93 src/sys/arch/zaurus/conf/GENERIC:1.93.4.1
--- src/sys/arch/zaurus/conf/GENERIC:1.93 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/zaurus/conf/GENERIC Mon Oct 9 23:33:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.93 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.93.4.1 2023/10/09 23:33:46 snj Exp $
#
# GENERIC machine description file
#
@@ -146,7 +146,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.30.1
--- src/sys/modules/Makefile.inc:1.8 Sun Feb 17 04:05:41 2019
+++ src/sys/modules/Makefile.inc Mon Oct 9 23:33:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2019/02/17 04:05:41 rin Exp $
+# $NetBSD: Makefile.inc,v 1.8.30.1 2023/10/09 23:33:47 snj 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
