Module Name: src
Committed By: snj
Date: Fri Oct 10 18:16:37 UTC 2014
Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/cobalt/conf [netbsd-7]: GENERIC
src/sys/arch/i386/conf [netbsd-7]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/mvmeppc/conf [netbsd-7]: GENERIC
src/sys/arch/shark/conf [netbsd-7]: GENERIC
src/sys/arch/sparc64/conf [netbsd-7]: GENERIC GENERIC.DEBUG
src/sys/arch/zaurus/conf [netbsd-7]: GENERIC
Log Message:
Apply patch (requested by bouyer/martin in ticket #116):
Disable DIAGNOSTIC and/or DEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.392 -r1.392.2.1 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.103 -r1.103.2.1 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.143 -r1.143.2.1 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.1107 -r1.1107.2.1 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.59 -r1.59.2.1 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.22 -r1.22.6.1 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.115 -r1.115.2.1 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.171 -r1.171.4.1 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.2 -r1.2.16.1 src/sys/arch/sparc64/conf/GENERIC.DEBUG
cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/arch/zaurus/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.392 src/sys/arch/amd64/conf/GENERIC:1.392.2.1
--- src/sys/arch/amd64/conf/GENERIC:1.392 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/amd64/conf/GENERIC Fri Oct 10 18:16:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: GENERIC,v 1.392.2.1 2014/10/10 18:16:36 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.392 $"
+#ident "GENERIC-$Revision: 1.392.2.1 $"
maxusers 64 # estimated number of users
@@ -86,7 +86,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
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.103 src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.1
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.103 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Oct 10 18:16:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.103 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: XEN3_DOM0,v 1.103.2.1 2014/10/10 18:16:36 snj Exp $
include "arch/amd64/conf/std.xen"
@@ -47,9 +47,9 @@ 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 KMEMSTATS # kernel memory statistics (vmstat -m)
+#options KMEMSTATS # kernel memory statistics (vmstat -m)
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/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.54 src/sys/arch/amd64/conf/XEN3_DOMU:1.54.2.1
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.54 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/amd64/conf/XEN3_DOMU Fri Oct 10 18:16:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.54 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: XEN3_DOMU,v 1.54.2.1 2014/10/10 18:16:36 snj Exp $
include "arch/amd64/conf/std.xen"
@@ -41,9 +41,9 @@ 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 KMEMSTATS # kernel memory statistics (vmstat -m)
+#options KMEMSTATS # kernel memory statistics (vmstat -m)
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/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.143 src/sys/arch/cobalt/conf/GENERIC:1.143.2.1
--- src/sys/arch/cobalt/conf/GENERIC:1.143 Sun Jul 20 10:06:10 2014
+++ src/sys/arch/cobalt/conf/GENERIC Fri Oct 10 18:16:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.143 2014/07/20 10:06:10 alnsn Exp $
+# $NetBSD: GENERIC,v 1.143.2.1 2014/10/10 18:16:36 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.143 $"
+#ident "GENERIC-$Revision: 1.143.2.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 KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # kernel dynamic debugger
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1107 src/sys/arch/i386/conf/GENERIC:1.1107.2.1
--- src/sys/arch/i386/conf/GENERIC:1.1107 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/i386/conf/GENERIC Fri Oct 10 18:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: GENERIC,v 1.1107.2.1 2014/10/10 18:16:37 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.1107 $"
+#ident "GENERIC-$Revision: 1.1107.2.1 $"
maxusers 64 # estimated number of users
@@ -107,7 +107,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # inexpensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive kernel consistency checks
# XXX to be commented out on release branch
#options DEBUG # expensive debugging checks/support
#options LOCKDEBUG # expensive locking checks/support
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.85 src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.1
--- src/sys/arch/i386/conf/XEN3_DOM0:1.85 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Oct 10 18:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.85 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: XEN3_DOM0,v 1.85.2.1 2014/10/10 18:16:37 snj Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -63,9 +63,9 @@ 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 KMEMSTATS # kernel memory statistics (vmstat -m)
+#options KMEMSTATS # kernel memory statistics (vmstat -m)
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/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.59 src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.1
--- src/sys/arch/i386/conf/XEN3_DOMU:1.59 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/i386/conf/XEN3_DOMU Fri Oct 10 18:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.59 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: XEN3_DOMU,v 1.59.2.1 2014/10/10 18:16:37 snj Exp $
include "arch/xen/conf/std.xen"
@@ -49,9 +49,9 @@ 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 KMEMSTATS # kernel memory statistics (vmstat -m)
+#options KMEMSTATS # kernel memory statistics (vmstat -m)
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/mvmeppc/conf/GENERIC
diff -u src/sys/arch/mvmeppc/conf/GENERIC:1.22 src/sys/arch/mvmeppc/conf/GENERIC:1.22.6.1
--- src/sys/arch/mvmeppc/conf/GENERIC:1.22 Sun Jun 30 21:38:58 2013
+++ src/sys/arch/mvmeppc/conf/GENERIC Fri Oct 10 18:16:37 2014
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.22 2013/06/30 21:38:58 rmind Exp $
+# $NetBSD: GENERIC,v 1.22.6.1 2014/10/10 18:16:37 snj Exp $
#
include "arch/mvmeppc/conf/std.mvmeppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.22 $"
+ident "GENERIC-$Revision: 1.22.6.1 $"
maxusers 8
@@ -29,8 +29,8 @@ options PIPE_SOCKETPAIR # smaller, but
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Diagnostic/debugging support options
-options DIAGNOSTIC # cheap kernel consistency checks
-options DEBUG # expensive debugging checks/support
+#options DIAGNOSTIC # cheap kernel consistency checks
+#options DEBUG # expensive debugging checks/support
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.115 src/sys/arch/shark/conf/GENERIC:1.115.2.1
--- src/sys/arch/shark/conf/GENERIC:1.115 Sun Aug 3 08:53:56 2014
+++ src/sys/arch/shark/conf/GENERIC Fri Oct 10 18:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.115 2014/08/03 08:53:56 martin Exp $
+# $NetBSD: GENERIC,v 1.115.2.1 2014/10/10 18:16:37 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.115 $"
+#ident "GENERIC-$Revision: 1.115.2.1 $"
# estimated number of users
maxusers 32
@@ -151,7 +151,7 @@ options MODULAR # new style module(7)
#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
options SYMTAB_SPACE=750000 # reserve symbol space for DDB
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.171 src/sys/arch/sparc64/conf/GENERIC:1.171.4.1
--- src/sys/arch/sparc64/conf/GENERIC:1.171 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/sparc64/conf/GENERIC Fri Oct 10 18:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.171 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: GENERIC,v 1.171.4.1 2014/10/10 18:16:37 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.171 $"
+#ident "GENERIC-$Revision: 1.171.4.1 $"
maxusers 64
@@ -104,7 +104,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/sparc64/conf/GENERIC.DEBUG
diff -u src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.2 src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.2.16.1
--- src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.2 Mon Dec 26 19:33:20 2011
+++ src/sys/arch/sparc64/conf/GENERIC.DEBUG Fri Oct 10 18:16:37 2014
@@ -1,15 +1,15 @@
-# $NetBSD: GENERIC.DEBUG,v 1.2 2011/12/26 19:33:20 martin Exp $
+# $NetBSD: GENERIC.DEBUG,v 1.2.16.1 2014/10/10 18:16:37 snj Exp $
#
# GENERIC with debugging support enabled.
#
include "arch/sparc64/conf/GENERIC"
-#ident "GENERIC.DEBUG.$Revision: 1.2 $"
+#ident "GENERIC.DEBUG.$Revision: 1.2.16.1 $"
makeoptions DEBUG="-g"
options DEBUG
-# options DIAGNOSTIC # already in GENERIC
+options DIAGNOSTIC
options LOCKDEBUG
options DB_MAX_WIDTH=160
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.57 src/sys/arch/zaurus/conf/GENERIC:1.57.2.1
--- src/sys/arch/zaurus/conf/GENERIC:1.57 Sun Aug 3 08:53:57 2014
+++ src/sys/arch/zaurus/conf/GENERIC Fri Oct 10 18:16:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.57 2014/08/03 08:53:57 martin Exp $
+# $NetBSD: GENERIC,v 1.57.2.1 2014/10/10 18:16:37 snj Exp $
#
# GENERIC machine description file
#
@@ -159,7 +159,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
