Add back DIAGNOSTIC option to x86 GENERIC kernels, as discussed on tech-kern.

This will have to be commented out on release branches.
This commit is contained in:
bouyer 2011-07-03 10:40:16 +00:00
parent c9afca8606
commit fd33bd72b3
2 changed files with 8 additions and 6 deletions

View File

@ -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 @@ include "arch/amd64/conf/std.amd64"
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 @@ powernow0 at cpu0 # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
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)

View File

@ -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 @@ include "arch/i386/conf/std.i386"
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 SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
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)