Module Name: src
Committed By: dholland
Date: Fri Jul 25 15:01:14 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: ALL DRMKMS GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: ALL DRMKMS GENERIC GENERIC_PS2TINY GENERIC_TINY
INSTALL_FLOPPY INSTALL_TINY NET4501 XEN3_DOM0 XEN3_DOMU
Log Message:
Fix description of DIAGNOSTIC in x86 kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/DRMKMS
cvs rdiff -u -r1.391 -r1.392 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.379 -r1.380 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/conf/DRMKMS
cvs rdiff -u -r1.1106 -r1.1107 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/i386/conf/GENERIC_PS2TINY
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/i386/conf/GENERIC_TINY
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/conf/INSTALL_FLOPPY
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/i386/conf/INSTALL_TINY
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/i386/conf/NET4501 \
src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/i386/conf/XEN3_DOMU
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/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.12 src/sys/arch/amd64/conf/ALL:1.13
--- src/sys/arch/amd64/conf/ALL:1.12 Wed Jul 2 07:18:32 2014
+++ src/sys/arch/amd64/conf/ALL Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.12 2014/07/02 07:18:32 ozaki-r Exp $
+# $NetBSD: ALL,v 1.13 2014/07/25 15:01:14 dholland Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.12 $"
+#ident "ALL-$Revision: 1.13 $"
maxusers 64 # estimated number of users
@@ -108,7 +108,7 @@ options BUFQ_READPRIO
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+options DIAGNOSTIC # inexpensive kernel consistency checks
options DEBUG # expensive debugging checks/support
options LOCKDEBUG # expensive locking checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
Index: src/sys/arch/amd64/conf/DRMKMS
diff -u src/sys/arch/amd64/conf/DRMKMS:1.6 src/sys/arch/amd64/conf/DRMKMS:1.7
--- src/sys/arch/amd64/conf/DRMKMS:1.6 Fri Jul 25 12:35:03 2014
+++ src/sys/arch/amd64/conf/DRMKMS Fri Jul 25 15:01:14 2014
@@ -10,7 +10,7 @@ radeondrmkmsfb* at radeonfbbus?
#nouveaufb* at nouveaufbbus
no options DIAGNOSTIC
-options DIAGNOSTIC # expensive kernel consistency check
+options DIAGNOSTIC # inexpensive kernel consistency checks
options DEBUG # expensive debugging checks/support
options LOCKDEBUG # debug locks
makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.391 src/sys/arch/amd64/conf/GENERIC:1.392
--- src/sys/arch/amd64/conf/GENERIC:1.391 Mon Jun 16 19:08:17 2014
+++ src/sys/arch/amd64/conf/GENERIC Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.391 2014/06/16 19:08:17 dsl Exp $
+# $NetBSD: GENERIC,v 1.392 2014/07/25 15:01:14 dholland 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.391 $"
+#ident "GENERIC-$Revision: 1.392 $"
maxusers 64 # estimated number of users
@@ -86,7 +86,7 @@ vmt0 at cpu0 # VMware Tools
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive 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.102 src/sys/arch/amd64/conf/XEN3_DOM0:1.103
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.102 Mon Jun 16 19:08:17 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.102 2014/06/16 19:08:17 dsl Exp $
+# $NetBSD: XEN3_DOM0,v 1.103 2014/07/25 15:01:14 dholland Exp $
include "arch/amd64/conf/std.xen"
@@ -47,7 +47,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+options DIAGNOSTIC # inexpensive 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.53 src/sys/arch/amd64/conf/XEN3_DOMU:1.54
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.53 Mon Mar 24 14:15:37 2014
+++ src/sys/arch/amd64/conf/XEN3_DOMU Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.53 2014/03/24 14:15:37 szptvlfn Exp $
+# $NetBSD: XEN3_DOMU,v 1.54 2014/07/25 15:01:14 dholland Exp $
include "arch/amd64/conf/std.xen"
@@ -41,7 +41,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+options DIAGNOSTIC # inexpensive 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/ALL
diff -u src/sys/arch/i386/conf/ALL:1.379 src/sys/arch/i386/conf/ALL:1.380
--- src/sys/arch/i386/conf/ALL:1.379 Wed Jul 2 07:18:32 2014
+++ src/sys/arch/i386/conf/ALL Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.379 2014/07/02 07:18:32 ozaki-r Exp $
+# $NetBSD: ALL,v 1.380 2014/07/25 15:01:14 dholland Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.379 $"
+#ident "ALL-$Revision: 1.380 $"
maxusers 64 # estimated number of users
@@ -109,7 +109,7 @@ options BUFQ_READPRIO
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+options DIAGNOSTIC # inexpensive kernel consistency checks
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/DRMKMS
diff -u src/sys/arch/i386/conf/DRMKMS:1.4 src/sys/arch/i386/conf/DRMKMS:1.5
--- src/sys/arch/i386/conf/DRMKMS:1.4 Fri Jul 25 12:35:03 2014
+++ src/sys/arch/i386/conf/DRMKMS Fri Jul 25 15:01:14 2014
@@ -10,7 +10,7 @@ radeondrmkmsfb* at radeonfbbus?
#nouveaufb* at nouveaufbbus
no options DIAGNOSTIC
-options DIAGNOSTIC # expensive kernel consistency check
+options DIAGNOSTIC # inexpensive kernel consistency checks
options DEBUG # expensive debugging checks/support
options LOCKDEBUG # debug locks
makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1106 src/sys/arch/i386/conf/GENERIC:1.1107
--- src/sys/arch/i386/conf/GENERIC:1.1106 Mon Jun 16 19:08:17 2014
+++ src/sys/arch/i386/conf/GENERIC Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1106 2014/06/16 19:08:17 dsl Exp $
+# $NetBSD: GENERIC,v 1.1107 2014/07/25 15:01:14 dholland 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.1106 $"
+#ident "GENERIC-$Revision: 1.1107 $"
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 # 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/GENERIC_PS2TINY
diff -u src/sys/arch/i386/conf/GENERIC_PS2TINY:1.72 src/sys/arch/i386/conf/GENERIC_PS2TINY:1.73
--- src/sys/arch/i386/conf/GENERIC_PS2TINY:1.72 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/i386/conf/GENERIC_PS2TINY Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.72 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.73 2014/07/25 15:01:14 dholland Exp $
#
# GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
# IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -55,7 +55,7 @@ options USERCONF # userconf(4) support
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Diagnostic/debugging support options
-#options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive 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/GENERIC_TINY
diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.138 src/sys/arch/i386/conf/GENERIC_TINY:1.139
--- src/sys/arch/i386/conf/GENERIC_TINY:1.138 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/i386/conf/GENERIC_TINY Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.138 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: GENERIC_TINY,v 1.139 2014/07/25 15:01:14 dholland Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -47,7 +47,7 @@ options PIPE_SOCKETPAIR # smaller, but
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Diagnostic/debugging support options
-#options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive 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/INSTALL_FLOPPY
diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.23 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.24
--- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.23 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/i386/conf/INSTALL_FLOPPY Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.23 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.24 2014/07/25 15:01:14 dholland Exp $
#
# INSTALL - Installation kernel.
#
@@ -67,7 +67,7 @@ no options RFC2292 # Previous version
no options PTRACE # Include ptrace(2)
# Diagnostic/debugging support options
-#options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive 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/INSTALL_TINY
diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.140 src/sys/arch/i386/conf/INSTALL_TINY:1.141
--- src/sys/arch/i386/conf/INSTALL_TINY:1.140 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/i386/conf/INSTALL_TINY Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.140 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: INSTALL_TINY,v 1.141 2014/07/25 15:01:14 dholland Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -56,7 +56,7 @@ options PIPE_SOCKETPAIR # smaller, but
no options EXEC_AOUT # we don't a.out support
# Diagnostic/debugging support options
-#options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive 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/NET4501
diff -u src/sys/arch/i386/conf/NET4501:1.84 src/sys/arch/i386/conf/NET4501:1.85
--- src/sys/arch/i386/conf/NET4501:1.84 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/i386/conf/NET4501 Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.84 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: NET4501,v 1.85 2014/07/25 15:01:14 dholland Exp $
#
# NET4501 -- kernel configuration for a Soekris Engineering net4501
# single-board computer.
@@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.84 $"
+#ident "NET4501-$Revision: 1.85 $"
maxusers 32 # estimated number of users
@@ -66,7 +66,7 @@ options USERCONF # userconf(4) support
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# Diagnostic/debugging support options
-#options DIAGNOSTIC # expensive kernel consistency checks
+#options DIAGNOSTIC # inexpensive 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_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.84 src/sys/arch/i386/conf/XEN3_DOM0:1.85
--- src/sys/arch/i386/conf/XEN3_DOM0:1.84 Mon Jun 16 19:08:17 2014
+++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.84 2014/06/16 19:08:17 dsl Exp $
+# $NetBSD: XEN3_DOM0,v 1.85 2014/07/25 15:01:14 dholland Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -63,7 +63,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+options DIAGNOSTIC # inexpensive 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.58 src/sys/arch/i386/conf/XEN3_DOMU:1.59
--- src/sys/arch/i386/conf/XEN3_DOMU:1.58 Mon Mar 24 14:15:38 2014
+++ src/sys/arch/i386/conf/XEN3_DOMU Fri Jul 25 15:01:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.58 2014/03/24 14:15:38 szptvlfn Exp $
+# $NetBSD: XEN3_DOMU,v 1.59 2014/07/25 15:01:14 dholland Exp $
include "arch/xen/conf/std.xen"
@@ -49,7 +49,7 @@ options SYSCTL_INCLUDE_DESCR # Include
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive kernel consistency checks
+options DIAGNOSTIC # inexpensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
