svn commit: r235884 - in stable/9/sys: amd64/amd64 amd64/conf conf i386/conf i386/i386

[Alan Cox]

Author: alc
Date: Thu May 24 05:11:21 2012
New Revision: 235884
URL: http://svn.freebsd.org/changeset/base/235884

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

Modified:
  stable/9/sys/amd64/amd64/pmap.c
  stable/9/sys/amd64/conf/NOTES
  stable/9/sys/conf/options.amd64
  stable/9/sys/conf/options.i386
  stable/9/sys/i386/conf/NOTES
  stable/9/sys/i386/i386/pmap.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/conf/   (props changed)

Modified: stable/9/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/9/sys/amd64/amd64/pmap.c	Thu May 24 04:46:40 2012	(r235883)
+++ stable/9/sys/amd64/amd64/pmap.c	Thu May 24 05:11:21 2012	(r235884)
@@ -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: stable/9/sys/amd64/conf/NOTES
==============================================================================
--- stable/9/sys/amd64/conf/NOTES	Thu May 24 04:46:40 2012	(r235883)
+++ stable/9/sys/amd64/conf/NOTES	Thu May 24 05:11:21 2012	(r235884)
@@ -556,6 +556,10 @@ options 	LINSYSFS
 
 options 	KSTACK_PAGES=5
 
+# Enable detailed accounting by the PV entry allocator.
+
+options 	PV_STATS
+
 #####################################################################
 
 # More undocumented options for linting.

Modified: stable/9/sys/conf/options.amd64
==============================================================================
--- stable/9/sys/conf/options.amd64	Thu May 24 04:46:40 2012	(r235883)
+++ stable/9/sys/conf/options.amd64	Thu May 24 05:11:21 2012	(r235884)
@@ -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: stable/9/sys/conf/options.i386
==============================================================================
--- stable/9/sys/conf/options.i386	Thu May 24 04:46:40 2012	(r235883)
+++ stable/9/sys/conf/options.i386	Thu May 24 05:11:21 2012	(r235884)
@@ -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: stable/9/sys/i386/conf/NOTES
==============================================================================
--- stable/9/sys/i386/conf/NOTES	Thu May 24 04:46:40 2012	(r235883)
+++ stable/9/sys/i386/conf/NOTES	Thu May 24 05:11:21 2012	(r235884)
@@ -973,6 +973,10 @@ device		lindev
 
 options 	KSTACK_PAGES=3
 
+# Enable detailed accounting by the PV entry allocator.
+
+options 	PV_STATS
+
 #####################################################################
 
 # More undocumented options for linting.

Modified: stable/9/sys/i386/i386/pmap.c
==============================================================================
--- stable/9/sys/i386/i386/pmap.c	Thu May 24 04:46:40 2012	(r235883)
+++ stable/9/sys/i386/i386/pmap.c	Thu May 24 05:11:21 2012	(r235884)
@@ -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