svn commit: r233433 - in head/sys: amd64/amd64 amd64/conf conf i386/conf i386/i386

[Alan Cox]

Author: alc
Date: Sat Mar 24 19:43:49 2012
New Revision: 233433
URL: http://svn.freebsd.org/changeset/base/233433

Log:
  Disable detailed PV entry accounting by default.  Add a config option
  to enable it.
  
  MFC after:	1 week

Modified:
  head/sys/amd64/amd64/pmap.c
  head/sys/amd64/conf/NOTES
  head/sys/conf/options.amd64
  head/sys/conf/options.i386
  head/sys/i386/conf/NOTES
  head/sys/i386/i386/pmap.c

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Sat Mar 24 19:41:43 2012	(r233432)
+++ head/sys/amd64/amd64/pmap.c	Sat Mar 24 19:43:49 2012	(r233433)
@@ -158,7 +158,6 @@ __FBSDID("$FreeBSD$");
 #define PMAP_INLINE
 #endif
 
-#define PV_STATS
 #ifdef PV_STATS
 #define PV_STAT(x)	do { x ; } while (0)
 #else

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES	Sat Mar 24 19:41:43 2012	(r233432)
+++ head/sys/amd64/conf/NOTES	Sat Mar 24 19:43:49 2012	(r233433)
@@ -559,6 +559,10 @@ options 	LINSYSFS
 
 options 	KSTACK_PAGES=5
 
+# Enable detailed accounting by the PV entry allocator.
+
+options 	PV_STATS
+
 #####################################################################
 
 # More undocumented options for linting.

Modified: head/sys/conf/options.amd64
==============================================================================
--- head/sys/conf/options.amd64	Sat Mar 24 19:41:43 2012	(r233432)
+++ head/sys/conf/options.amd64	Sat Mar 24 19:43:49 2012	(r233433)
@@ -10,6 +10,7 @@ PERFMON
 MPTABLE_FORCE_HTT
 MP_WATCHDOG
 NKPT			opt_pmap.h
+PV_STATS		opt_pmap.h
 
 # Options for emulators.  These should only be used at config time, so
 # they are handled like options for static filesystems

Modified: head/sys/conf/options.i386
==============================================================================
--- head/sys/conf/options.i386	Sat Mar 24 19:41:43 2012	(r233432)
+++ head/sys/conf/options.i386	Sat Mar 24 19:43:49 2012	(r233433)
@@ -16,6 +16,7 @@ NKPT			opt_pmap.h
 PERFMON
 PMAP_SHPGPERPROC	opt_pmap.h
 POWERFAIL_NMI		opt_trap.h
+PV_STATS		opt_pmap.h
 
 # Options for emulators.  These should only be used at config time, so
 # they are handled like options for static filesystems

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES	Sat Mar 24 19:41:43 2012	(r233432)
+++ head/sys/i386/conf/NOTES	Sat Mar 24 19:43:49 2012	(r233433)
@@ -976,6 +976,10 @@ device		lindev
 
 options 	KSTACK_PAGES=3
 
+# Enable detailed accounting by the PV entry allocator.
+
+options 	PV_STATS
+
 #####################################################################
 
 # More undocumented options for linting.

Modified: head/sys/i386/i386/pmap.c
==============================================================================
--- head/sys/i386/i386/pmap.c	Sat Mar 24 19:41:43 2012	(r233432)
+++ head/sys/i386/i386/pmap.c	Sat Mar 24 19:43:49 2012	(r233433)
@@ -172,7 +172,6 @@ __FBSDID("$FreeBSD$");
 #define PMAP_INLINE
 #endif
 
-#define PV_STATS
 #ifdef PV_STATS
 #define PV_STAT(x)	do { x ; } while (0)
 #else