Module Name: src
Committed By: bouyer
Date: Sun Jul 3 10:40:16 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
Add back DIAGNOSTIC option to x86 GENERIC kernels, as discussed on tech-kern.
This will have to be commented out on release branches.
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1034 -r1.1035 src/sys/arch/i386/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.321 src/sys/arch/amd64/conf/GENERIC:1.322
--- src/sys/arch/amd64/conf/GENERIC:1.321 Tue Jun 21 05:01:18 2011
+++ src/sys/arch/amd64/conf/GENERIC Sun Jul 3 10:40:16 2011
@@ -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)
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1034 src/sys/arch/i386/conf/GENERIC:1.1035
--- src/sys/arch/i386/conf/GENERIC:1.1034 Tue Jun 21 05:01:17 2011
+++ src/sys/arch/i386/conf/GENERIC Sun Jul 3 10:40:16 2011
@@ -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)
