[src/trunk]: src/sys/arch Add back DIAGNOSTIC option to x86 GENERIC kernels, ...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4c78f662a44a
branches:  trunk
changeset: 766858:4c78f662a44a
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Jul 03 10:40:16 2011 +0000

description:
Add back DIAGNOSTIC option to x86 GENERIC kernels, as discussed on tech-kern.
This will have to be commented out on release branches.

diffstat:

 sys/arch/amd64/conf/GENERIC |  7 ++++---
 sys/arch/i386/conf/GENERIC  |  7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r a12570562ac2 -r 4c78f662a44a sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Jul 03 10:34:25 2011 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun Jul 03 10:40:16 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.321 2011/06/21 05:01:18 jruoho Exp $
+# $NetBSD: GENERIC,v 1.322 2011/07/03 10:40:16 bouyer Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.321 $"
+#ident                 "GENERIC-$Revision: 1.322 $"
 
 maxusers       64              # estimated number of users
 
@@ -91,7 +91,8 @@
 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
 #options       KMEMSTATS       # kernel memory statistics (vmstat -m)
diff -r a12570562ac2 -r 4c78f662a44a sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Jul 03 10:34:25 2011 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Jul 03 10:40:16 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1034 2011/06/21 05:01:17 jruoho Exp $
+# $NetBSD: GENERIC,v 1.1035 2011/07/03 10:40:16 bouyer Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1034 $"
+#ident                 "GENERIC-$Revision: 1.1035 $"
 
 maxusers       64              # estimated number of users
 
@@ -113,7 +113,8 @@
 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
 #options       KMEMSTATS       # kernel memory statistics (vmstat -m)