Module Name: src
Committed By: sborrill
Date: Wed Aug 15 15:33:01 UTC 2012
Modified Files:
src/sys/arch/amd64/conf [netbsd-6]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/cobalt/conf [netbsd-6]: GENERIC
src/sys/arch/i386/conf [netbsd-6]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/mvmeppc/conf [netbsd-6]: GENERIC
src/sys/arch/shark/conf [netbsd-6]: GENERIC
src/sys/arch/sparc64/conf [netbsd-6]: GENERIC GENERIC.DEBUG
src/sys/arch/zaurus/conf [netbsd-6]: GENERIC
Log Message:
Pull up the following revisions(s) (requested by martin in ticket #502):
sys/arch/cobalt/conf/GENERIC: patch
sys/arch/i386/conf/GENERIC: patch
sys/arch/i386/conf/XEN3_DOM0: patch
sys/arch/i386/conf/XEN3_DOMU: patch
sys/arch/mvmeppc/conf/GENERIC: patch
sys/arch/shark/conf/GENERIC: patch
sys/arch/sparc64/conf/GENERIC: patch
sys/arch/sparc64/conf/GENERIC.DEBUG: patch
sys/arch/zaurus/conf/GENERIC: patch
Switch off DIAGNOSTIC and/or DEBUG on release kernels.
Enable DIAGNOSTIC in DEBUG kernels to allow for option
being switched off in GENERIC.
To generate a diff of this commit:
cvs rdiff -u -r1.348.2.5 -r1.348.2.6 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.77.2.5 -r1.77.2.6 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.36.2.1 -r1.36.2.2 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.133 -r1.133.2.1 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.1066.2.6 -r1.1066.2.7 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.60.2.4 -r1.60.2.5 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.41.2.1 -r1.41.2.2 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.98.2.1 -r1.98.2.2 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.148.2.1 -r1.148.2.2 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/arch/sparc64/conf/GENERIC.DEBUG
cvs rdiff -u -r1.51.2.1 -r1.51.2.2 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.348.2.5 src/sys/arch/amd64/conf/GENERIC:1.348.2.6
--- src/sys/arch/amd64/conf/GENERIC:1.348.2.5 Fri Jun 15 08:48:45 2012
+++ src/sys/arch/amd64/conf/GENERIC Wed Aug 15 15:32:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.348.2.5 2012/06/15 08:48:45 sborrill Exp $
+# $NetBSD: GENERIC,v 1.348.2.6 2012/08/15 15:32:59 sborrill 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.348.2.5 $"
+#ident "GENERIC-$Revision: 1.348.2.6 $"
maxusers 64 # estimated number of users
@@ -86,7 +86,7 @@ powernow0 at cpu0 # AMD PowerNow! and C
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # expensive 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.77.2.5 src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.6
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.5 Tue Jul 3 21:22:07 2012
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Aug 15 15:32:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.77.2.5 2012/07/03 21:22:07 jdc Exp $
+# $NetBSD: XEN3_DOM0,v 1.77.2.6 2012/08/15 15:32:59 sborrill Exp $
include "arch/amd64/conf/std.xen"
@@ -50,7 +50,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.36.2.1 src/sys/arch/amd64/conf/XEN3_DOMU:1.36.2.2
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.36.2.1 Sat Feb 25 21:18:02 2012
+++ src/sys/arch/amd64/conf/XEN3_DOMU Wed Aug 15 15:32:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.36.2.1 2012/02/25 21:18:02 sborrill Exp $
+# $NetBSD: XEN3_DOMU,v 1.36.2.2 2012/08/15 15:32:59 sborrill Exp $
include "arch/amd64/conf/std.xen"
@@ -44,7 +44,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.133 src/sys/arch/cobalt/conf/GENERIC:1.133.2.1
--- src/sys/arch/cobalt/conf/GENERIC:1.133 Sun Dec 18 05:49:25 2011
+++ src/sys/arch/cobalt/conf/GENERIC Wed Aug 15 15:33:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.133 2011/12/18 05:49:25 dholland Exp $
+# $NetBSD: GENERIC,v 1.133.2.1 2012/08/15 15:33:00 sborrill 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.133 $"
+#ident "GENERIC-$Revision: 1.133.2.1 $"
maxusers 32
@@ -43,7 +43,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.1066.2.6 src/sys/arch/i386/conf/GENERIC:1.1066.2.7
--- src/sys/arch/i386/conf/GENERIC:1.1066.2.6 Sun Aug 12 18:41:35 2012
+++ src/sys/arch/i386/conf/GENERIC Wed Aug 15 15:33:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1066.2.6 2012/08/12 18:41:35 martin Exp $
+# $NetBSD: GENERIC,v 1.1066.2.7 2012/08/15 15:33:00 sborrill 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.1066.2.6 $"
+#ident "GENERIC-$Revision: 1.1066.2.7 $"
maxusers 64 # estimated number of users
@@ -107,7 +107,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # expensive 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.60.2.4 src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.5
--- src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.4 Tue Jun 12 17:47:51 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Wed Aug 15 15:33:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.60.2.4 2012/06/12 17:47:51 riz Exp $
+# $NetBSD: XEN3_DOM0,v 1.60.2.5 2012/08/15 15:33:00 sborrill Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -65,7 +65,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.41.2.1 src/sys/arch/i386/conf/XEN3_DOMU:1.41.2.2
--- src/sys/arch/i386/conf/XEN3_DOMU:1.41.2.1 Sat Feb 25 21:18:02 2012
+++ src/sys/arch/i386/conf/XEN3_DOMU Wed Aug 15 15:33:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.41.2.1 2012/02/25 21:18:02 sborrill Exp $
+# $NetBSD: XEN3_DOMU,v 1.41.2.2 2012/08/15 15:33:00 sborrill Exp $
include "arch/xen/conf/std.xen"
@@ -51,7 +51,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
Index: src/sys/arch/mvmeppc/conf/GENERIC
diff -u src/sys/arch/mvmeppc/conf/GENERIC:1.15 src/sys/arch/mvmeppc/conf/GENERIC:1.15.2.1
--- src/sys/arch/mvmeppc/conf/GENERIC:1.15 Sun Dec 18 05:49:30 2011
+++ src/sys/arch/mvmeppc/conf/GENERIC Wed Aug 15 15:33:00 2012
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.15 2011/12/18 05:49:30 dholland Exp $
+# $NetBSD: GENERIC,v 1.15.2.1 2012/08/15 15:33:00 sborrill Exp $
#
include "arch/mvmeppc/conf/std.mvmeppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.15 $"
+ident "GENERIC-$Revision: 1.15.2.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.98.2.1 src/sys/arch/shark/conf/GENERIC:1.98.2.2
--- src/sys/arch/shark/conf/GENERIC:1.98.2.1 Tue Jun 12 17:47:54 2012
+++ src/sys/arch/shark/conf/GENERIC Wed Aug 15 15:33:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.98.2.1 2012/06/12 17:47:54 riz Exp $
+# $NetBSD: GENERIC,v 1.98.2.2 2012/08/15 15:33:00 sborrill 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.98.2.1 $"
+#ident "GENERIC-$Revision: 1.98.2.2 $"
# estimated number of users
maxusers 32
@@ -158,7 +158,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=450000 # reserve symbol space for DDB
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.148.2.1 src/sys/arch/sparc64/conf/GENERIC:1.148.2.2
--- src/sys/arch/sparc64/conf/GENERIC:1.148.2.1 Tue Jun 12 17:48:04 2012
+++ src/sys/arch/sparc64/conf/GENERIC Wed Aug 15 15:33:00 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.148.2.1 2012/06/12 17:48:04 riz Exp $
+# $NetBSD: GENERIC,v 1.148.2.2 2012/08/15 15:33:00 sborrill 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.148.2.1 $"
+#ident "GENERIC-$Revision: 1.148.2.2 $"
maxusers 64
@@ -105,7 +105,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.2.1
--- src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.2 Mon Dec 26 19:33:20 2011
+++ src/sys/arch/sparc64/conf/GENERIC.DEBUG Wed Aug 15 15:33:01 2012
@@ -1,15 +1,15 @@
-# $NetBSD: GENERIC.DEBUG,v 1.2 2011/12/26 19:33:20 martin Exp $
+# $NetBSD: GENERIC.DEBUG,v 1.2.2.1 2012/08/15 15:33:01 sborrill Exp $
#
# GENERIC with debugging support enabled.
#
include "arch/sparc64/conf/GENERIC"
-#ident "GENERIC.DEBUG.$Revision: 1.2 $"
+#ident "GENERIC.DEBUG.$Revision: 1.2.2.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.51.2.1 src/sys/arch/zaurus/conf/GENERIC:1.51.2.2
--- src/sys/arch/zaurus/conf/GENERIC:1.51.2.1 Tue Jun 12 17:47:54 2012
+++ src/sys/arch/zaurus/conf/GENERIC Wed Aug 15 15:33:01 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.51.2.1 2012/06/12 17:47:54 riz Exp $
+# $NetBSD: GENERIC,v 1.51.2.2 2012/08/15 15:33:01 sborrill Exp $
#
# GENERIC machine description file
#
@@ -158,7 +158,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
