Module Name: src
Committed By: maxv
Date: Sat Aug 8 06:36:26 UTC 2015
Modified Files:
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0
src/sys/arch/arc/conf: GENERIC
src/sys/arch/bebox/conf: GENERIC
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/cobalt/conf: GENERIC
src/sys/arch/evbarm/conf: CUBOX-I GUMSTIX HPT5325
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcsh/conf: GENERIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/mac68k/conf: GENERIC
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/news68k/conf: GENERIC
src/sys/arch/next68k/conf: GENERIC
src/sys/arch/rs6000/conf: GENERIC
src/sys/arch/sgimips/conf: GENERIC32_IP12
src/sys/arch/shark/conf: GENERIC
src/sys/arch/vax/conf: GENERIC VAX780
src/sys/arch/x68k/conf: GENERIC
Log Message:
Remove KMEMSTATS.
To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.413 -r1.414 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.114 -r1.115 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.147 -r1.148 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/hpcsh/conf/GENERIC
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.220 -r1.221 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/next68k/conf/GENERIC
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/rs6000/conf/GENERIC
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sgimips/conf/GENERIC32_IP12
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/x68k/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/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.364 src/sys/arch/alpha/conf/GENERIC:1.365
--- src/sys/arch/alpha/conf/GENERIC:1.364 Tue Jan 6 17:50:24 2015
+++ src/sys/arch/alpha/conf/GENERIC Sat Aug 8 06:36:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.364 2015/01/06 17:50:24 macallan Exp $
+# $NetBSD: GENERIC,v 1.365 2015/08/08 06:36:24 maxv Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.364 $"
+ident "GENERIC-$Revision: 1.365 $"
maxusers 32
@@ -56,7 +56,6 @@ options NTP # kernel PLL for NTP
# Diagnostic/debugging support options
#options DIAGNOSTIC # Cheap kernel consistency checks
#options DEBUG # Expensive debugging checks/support
-#options KMEMSTATS # Collect kmem usage statistics
options DDB # kernel debugger
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#makeoptions DEBUG="-g"
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.29 src/sys/arch/amd64/conf/ALL:1.30
--- src/sys/arch/amd64/conf/ALL:1.29 Sun May 3 02:52:50 2015
+++ src/sys/arch/amd64/conf/ALL Sat Aug 8 06:36:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.29 2015/05/03 02:52:50 pgoyette Exp $
+# $NetBSD: ALL,v 1.30 2015/08/08 06:36:24 maxv 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.29 $"
+#ident "ALL-$Revision: 1.30 $"
maxusers 64 # estimated number of users
@@ -112,7 +112,6 @@ options BUFQ_PRIOCSCAN
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)
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.413 src/sys/arch/amd64/conf/GENERIC:1.414
--- src/sys/arch/amd64/conf/GENERIC:1.413 Sun May 3 02:52:50 2015
+++ src/sys/arch/amd64/conf/GENERIC Sat Aug 8 06:36:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.413 2015/05/03 02:52:50 pgoyette Exp $
+# $NetBSD: GENERIC,v 1.414 2015/08/08 06:36:24 maxv 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.413 $"
+#ident "GENERIC-$Revision: 1.414 $"
maxusers 64 # estimated number of users
@@ -91,7 +91,6 @@ options DIAGNOSTIC # inexpensive kernel
# 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)
#
# Because gcc omits the frame pointer for any -O level, the line below
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.114 src/sys/arch/amd64/conf/XEN3_DOM0:1.115
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.114 Thu Jul 16 15:43:10 2015
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Aug 8 06:36:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.114 2015/07/16 15:43:10 bouyer Exp $
+# $NetBSD: XEN3_DOM0,v 1.115 2015/08/08 06:36:24 maxv Exp $
include "arch/amd64/conf/std.xen"
@@ -49,7 +49,6 @@ options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # inexpensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
-options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
Index: src/sys/arch/arc/conf/GENERIC
diff -u src/sys/arch/arc/conf/GENERIC:1.184 src/sys/arch/arc/conf/GENERIC:1.185
--- src/sys/arch/arc/conf/GENERIC:1.184 Sun Nov 16 16:01:40 2014
+++ src/sys/arch/arc/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.184 2014/11/16 16:01:40 manu Exp $
+# $NetBSD: GENERIC,v 1.185 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.184 $"
+#ident "GENERIC-$Revision: 1.185 $"
maxusers 32 # estimated number of users
@@ -65,7 +65,6 @@ options SYSCTL_INCLUDE_DESCR # Include
# Diagnostic/debugging support options
#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
#options KGDB # remote gdb
Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.145 src/sys/arch/bebox/conf/GENERIC:1.146
--- src/sys/arch/bebox/conf/GENERIC:1.145 Sun Nov 16 16:01:40 2014
+++ src/sys/arch/bebox/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.145 2014/11/16 16:01:40 manu Exp $
+# $NetBSD: GENERIC,v 1.146 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.145 $"
+#ident "GENERIC-$Revision: 1.146 $"
maxusers 32
@@ -49,7 +49,6 @@ options SYSCTL_INCLUDE_DESCR # Include
# Diagnostic/debugging support options
#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_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # Enable history editing in DDB
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.155 src/sys/arch/cats/conf/GENERIC:1.156
--- src/sys/arch/cats/conf/GENERIC:1.155 Sun Nov 16 16:01:40 2014
+++ src/sys/arch/cats/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.155 2014/11/16 16:01:40 manu Exp $
+# $NetBSD: GENERIC,v 1.156 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -155,7 +155,6 @@ options SYSVSHM # System V-like memory
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
options IRQSTATS # manage IRQ statistics
-#options KMEMSTATS # kernel memory statistics
options SCSIVERBOSE # Verbose SCSI errors
options PCIVERBOSE # Verbose PCI descriptions
options MIIVERBOSE # verbose PHY autoconfig messages
Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.94 src/sys/arch/cats/conf/INSTALL:1.95
--- src/sys/arch/cats/conf/INSTALL:1.94 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/cats/conf/INSTALL Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.94 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: INSTALL,v 1.95 2015/08/08 06:36:25 maxv Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -105,7 +105,6 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE #
# Miscellaneous kernel options
#options KTRACE # system call tracing, a la ktrace(1)
#options IRQSTATS # manage IRQ statistics
-#options KMEMSTATS # kernel memory statistics
#options SCSIVERBOSE # Verbose SCSI errors
#options PCIVERBOSE # Verbose PCI descriptions
#options MIIVERBOSE # verbose PHY autoconfig messages
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.147 src/sys/arch/cobalt/conf/GENERIC:1.148
--- src/sys/arch/cobalt/conf/GENERIC:1.147 Sun Nov 16 16:01:40 2014
+++ src/sys/arch/cobalt/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.147 2014/11/16 16:01:40 manu Exp $
+# $NetBSD: GENERIC,v 1.148 2015/08/08 06:36:25 maxv 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.147 $"
+#ident "GENERIC-$Revision: 1.148 $"
maxusers 32
@@ -44,7 +44,6 @@ options SYSCTL_INCLUDE_DESCR # Include
# Debugging options
options DIAGNOSTIC # extra kernel sanity checking
#options DEBUG # extra kernel debugging support
-#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # kernel dynamic debugger
#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.3 src/sys/arch/evbarm/conf/CUBOX-I:1.4
--- src/sys/arch/evbarm/conf/CUBOX-I:1.3 Thu Jul 30 08:09:36 2015
+++ src/sys/arch/evbarm/conf/CUBOX-I Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.3 2015/07/30 08:09:36 ryo Exp $
+# $NetBSD: CUBOX-I,v 1.4 2015/08/08 06:36:25 maxv Exp $
#
# CuBox-i
# - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -52,7 +52,6 @@ options DIAGNOSTIC # internally consist
#options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
options LOCKDEBUG # expensive locking checks/support
-options KMEMSTATS # kernel memory statistics (vmstat -m)
options IRQSTATS # manage IRQ statistics
#options NO_POWERSAVE # uncomment this to run under ICE
Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.84 src/sys/arch/evbarm/conf/GUMSTIX:1.85
--- src/sys/arch/evbarm/conf/GUMSTIX:1.84 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/evbarm/conf/GUMSTIX Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.84 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: GUMSTIX,v 1.85 2015/08/08 06:36:25 maxv Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -136,7 +136,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
options KTRACE # system call tracing, a la ktrace(1)
options IRQSTATS # manage IRQ statistics
-#options KMEMSTATS # kernel memory statistics
options PCMCIAVERBOSE # verbose PCMCIA configuration messages
#options USBVERBOSE # verbose USB device autoconfig messages
options MIIVERBOSE # Verbose MII autoconfuration messages
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.24 src/sys/arch/evbarm/conf/HPT5325:1.25
--- src/sys/arch/evbarm/conf/HPT5325:1.24 Fri Oct 17 18:45:14 2014
+++ src/sys/arch/evbarm/conf/HPT5325 Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.24 2014/10/17 18:45:14 martin Exp $
+# $NetBSD: HPT5325,v 1.25 2015/08/08 06:36:25 maxv Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -134,7 +134,6 @@ options SYSVSHM # System V-like memory
#options KTRACE # system call tracing, a la ktrace(1)
options IRQSTATS # manage IRQ statistics
#options LKM # loadable kernel modules
-#options KMEMSTATS # kernel memory statistics
options MIIVERBOSE # Verbose MII autoconfuration messages
#options PCIVERBOSE # Verbose PCI descriptions
options USBVERBOSE # verbose USB device autoconfig messages
Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.190 src/sys/arch/hp300/conf/GENERIC:1.191
--- src/sys/arch/hp300/conf/GENERIC:1.190 Sun Nov 16 16:01:41 2014
+++ src/sys/arch/hp300/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.190 2014/11/16 16:01:41 manu Exp $
+# $NetBSD: GENERIC,v 1.191 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.190 $"
+#ident "GENERIC-$Revision: 1.191 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -70,7 +70,6 @@ options MODULAR_DEFAULT_AUTOLOAD
# Debugging options
#options DIAGNOSTIC # Extra kernel sanity checks
#options DEBUG # Enable misc. kernel debugging code
-#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # Kernel Dynamic Debugger
options DDB_HISTORY_SIZE=512 # Enable history editing in DDB
#options KGDB # remote debugger
Index: src/sys/arch/hpcsh/conf/GENERIC
diff -u src/sys/arch/hpcsh/conf/GENERIC:1.106 src/sys/arch/hpcsh/conf/GENERIC:1.107
--- src/sys/arch/hpcsh/conf/GENERIC:1.106 Sun Nov 16 16:01:41 2014
+++ src/sys/arch/hpcsh/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.106 2014/11/16 16:01:41 manu Exp $
+# $NetBSD: GENERIC,v 1.107 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -87,7 +87,6 @@ options SYSCTL_INCLUDE_DESCR # Include
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
-#options KMEMSTATS # kernel memory statistics (vmstat -m)
#options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.46 src/sys/arch/landisk/conf/GENERIC:1.47
--- src/sys/arch/landisk/conf/GENERIC:1.46 Thu Feb 5 14:04:46 2015
+++ src/sys/arch/landisk/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.46 2015/02/05 14:04:46 nonaka Exp $
+# $NetBSD: GENERIC,v 1.47 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.46 $"
+#ident "GENERIC-$Revision: 1.47 $"
maxusers 16 # estimated number of users
@@ -73,7 +73,6 @@ options SYSCTL_INCLUDE_DESCR # Include
# Diagnostic/debugging support options
#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_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
options DDB_HISTORY_SIZE=512 # Enable history editing in DDB
Index: src/sys/arch/mac68k/conf/GENERIC
diff -u src/sys/arch/mac68k/conf/GENERIC:1.220 src/sys/arch/mac68k/conf/GENERIC:1.221
--- src/sys/arch/mac68k/conf/GENERIC:1.220 Sun Nov 16 16:01:41 2014
+++ src/sys/arch/mac68k/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.220 2014/11/16 16:01:41 manu Exp $
+# $NetBSD: GENERIC,v 1.221 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mac68k/conf/std.mac68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.220 $"
+#ident "GENERIC-$Revision: 1.221 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -67,7 +67,6 @@ options SYSCTL_INCLUDE_DESCR # Include
#options DIAGNOSTIC # cheap kernel consistency checks
#options DEBUG # expensive debugging checks/support
#options LOCKDEBUG # kernel lock debugging
-options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
#options KGDB # remote debugger
Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.126 src/sys/arch/netwinder/conf/GENERIC:1.127
--- src/sys/arch/netwinder/conf/GENERIC:1.126 Sun Nov 16 16:01:42 2014
+++ src/sys/arch/netwinder/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.126 2014/11/16 16:01:42 manu Exp $
+# $NetBSD: GENERIC,v 1.127 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -147,7 +147,6 @@ options SYSVSHM # System V-like memory
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
options IRQSTATS # manage IRQ statistics
-#options KMEMSTATS # kernel memory statistics
#options SCSIVERBOSE # Verbose SCSI errors
options PCIVERBOSE # Verbose PCI descriptions
options MIIVERBOSE # Verbose MII autoconfuration messages
Index: src/sys/arch/news68k/conf/GENERIC
diff -u src/sys/arch/news68k/conf/GENERIC:1.125 src/sys/arch/news68k/conf/GENERIC:1.126
--- src/sys/arch/news68k/conf/GENERIC:1.125 Sun Nov 16 16:01:42 2014
+++ src/sys/arch/news68k/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.125 2014/11/16 16:01:42 manu Exp $
+# $NetBSD: GENERIC,v 1.126 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/news68k/conf/std.news68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.125 $"
+#ident "GENERIC-$Revision: 1.126 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -55,7 +55,6 @@ options SYSCTL_INCLUDE_DESCR # Include
# Debugging options
#options DIAGNOSTIC # extra kernel sanity checking
#options DEBUG # extra kernel debugging support
-#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # kernel dynamic debugger
#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
#options DDB_ONPANIC=1 # see also sysctl(7): `ddb.onpanic'
Index: src/sys/arch/next68k/conf/GENERIC
diff -u src/sys/arch/next68k/conf/GENERIC:1.139 src/sys/arch/next68k/conf/GENERIC:1.140
--- src/sys/arch/next68k/conf/GENERIC:1.139 Sun Nov 16 16:01:42 2014
+++ src/sys/arch/next68k/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.139 2014/11/16 16:01:42 manu Exp $
+# $NetBSD: GENERIC,v 1.140 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/next68k/conf/std.next68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.139 $"
+#ident "GENERIC-$Revision: 1.140 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -63,7 +63,6 @@ options DDB_HISTORY_SIZE=100 # enable h
#options KGDB_DEVRATE=9600 # baud rate
# Other debugging options
-options KMEMSTATS # kernel memory statistics (vmstat -m)
#options PMAP_DEBUG
options SCSIDEBUG
options SCSIVERBOSE # Verbose SCSI errors
Index: src/sys/arch/rs6000/conf/GENERIC
diff -u src/sys/arch/rs6000/conf/GENERIC:1.33 src/sys/arch/rs6000/conf/GENERIC:1.34
--- src/sys/arch/rs6000/conf/GENERIC:1.33 Sun Nov 16 16:01:42 2014
+++ src/sys/arch/rs6000/conf/GENERIC Sat Aug 8 06:36:25 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.33 2014/11/16 16:01:42 manu Exp $
+# $NetBSD: GENERIC,v 1.34 2015/08/08 06:36:25 maxv Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed con
#makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee
-#ident "GENERIC-$Revision: 1.33 $"
+#ident "GENERIC-$Revision: 1.34 $"
maxusers 32
@@ -60,7 +60,6 @@ options SYSCTL_INCLUDE_DESCR # Include
#options DIAGNOSTIC # cheap kernel consistency checks
options DEBUG # expensive debugging checks/support
options PMAPDEBUG
-#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
#makeoptions DEBUG="-g"
Index: src/sys/arch/sgimips/conf/GENERIC32_IP12
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP12:1.28 src/sys/arch/sgimips/conf/GENERIC32_IP12:1.29
--- src/sys/arch/sgimips/conf/GENERIC32_IP12:1.28 Sun Nov 16 16:01:43 2014
+++ src/sys/arch/sgimips/conf/GENERIC32_IP12 Sat Aug 8 06:36:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP12,v 1.28 2014/11/16 16:01:43 manu Exp $
+# $NetBSD: GENERIC32_IP12,v 1.29 2015/08/08 06:36:26 maxv Exp $
#
# GENERIC32_IP12 machine description file
#
@@ -32,7 +32,7 @@ makeoptions TEXTADDR=0x80002000 # entry
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.28 $"
+#ident "GENERIC32-IP2x-$Revision: 1.29 $"
maxusers 32
@@ -67,7 +67,6 @@ options SYSCTL_INCLUDE_DESCR # Include
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive 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=512 # enable history editing in DDB
#options KGDB # remote debugger
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.121 src/sys/arch/shark/conf/GENERIC:1.122
--- src/sys/arch/shark/conf/GENERIC:1.121 Sun Nov 16 16:01:43 2014
+++ src/sys/arch/shark/conf/GENERIC Sat Aug 8 06:36:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.121 2014/11/16 16:01:43 manu Exp $
+# $NetBSD: GENERIC,v 1.122 2015/08/08 06:36:26 maxv 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.121 $"
+#ident "GENERIC-$Revision: 1.122 $"
# estimated number of users
maxusers 32
@@ -143,7 +143,6 @@ options INSECURE # disable kernel secu
# Miscellaneous kernel options
options KTRACE # system call tracing, a la ktrace(1)
options IRQSTATS # manage IRQ statistics, XXX temp required
-options KMEMSTATS # kernel memory statistics, XXX temp required
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.195 src/sys/arch/vax/conf/GENERIC:1.196
--- src/sys/arch/vax/conf/GENERIC:1.195 Sat Dec 20 13:16:04 2014
+++ src/sys/arch/vax/conf/GENERIC Sat Aug 8 06:36:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.195 2014/12/20 13:16:04 jklos Exp $
+# $NetBSD: GENERIC,v 1.196 2015/08/08 06:36:26 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.195 $"
+#ident "GENERIC-$Revision: 1.196 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -53,7 +53,6 @@ options DDB_HISTORY_SIZE=512 # enable h
options KTRACE
#options DIAGNOSTIC
#options DEBUG
-#options KMEMSTATS
#options PMAPDEBUG
#options TRAPDEBUG
#options LOCKDEBUG
Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.19 src/sys/arch/vax/conf/VAX780:1.20
--- src/sys/arch/vax/conf/VAX780:1.19 Sun Nov 16 16:01:43 2014
+++ src/sys/arch/vax/conf/VAX780 Sat Aug 8 06:36:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.19 2014/11/16 16:01:43 manu Exp $
+# $NetBSD: VAX780,v 1.20 2015/08/08 06:36:26 maxv Exp $
#
# 11/780,750,730 machine description file
#
@@ -38,7 +38,6 @@ options DDB
options KTRACE
#options DIAGNOSTIC
#options DEBUG
-#options KMEMSTATS
#options PMAPDEBUG
#options TRAPDEBUG
#options LOCKDEBUG
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.179 src/sys/arch/x68k/conf/GENERIC:1.180
--- src/sys/arch/x68k/conf/GENERIC:1.179 Sun Nov 16 16:01:43 2014
+++ src/sys/arch/x68k/conf/GENERIC Sat Aug 8 06:36:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.179 2014/11/16 16:01:43 manu Exp $
+# $NetBSD: GENERIC,v 1.180 2015/08/08 06:36:26 maxv Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.179 $"
+#ident "GENERIC-$Revision: 1.180 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -69,11 +69,6 @@ options RTC_OFFSET=-540 # hardware cloc
## System call tracing (see ktrace(1)).
options KTRACE
-## Collect statistics on kernel malloc's and free's. This does have a
-## significant performance hit on slower machines, so it is intended for
-## diagnostic use only.
-#options KMEMSTATS
-
## System V compatible IPC subsystem. (msgctl(2), semctl(2), and shmctl(2))
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
