svn commit: r274766 - head/sys/dev/hwpmc

[Ed Maste]

Author: emaste
Date: Thu Nov 20 23:16:19 2014
New Revision: 274766
URL: https://svnweb.freebsd.org/changeset/base/274766

Log:
  Clamp too-large hwpmc callchaindepth to the maximum
  
  If the depth requested by the user is too large, it's better to provide
  the maximum than the smaller default.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/hwpmc/hwpmc_mod.c

Modified: head/sys/dev/hwpmc/hwpmc_mod.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_mod.c	Thu Nov 20 23:00:17 2014	(r274765)
+++ head/sys/dev/hwpmc/hwpmc_mod.c	Thu Nov 20 23:16:19 2014	(r274766)
@@ -4749,8 +4749,9 @@ pmc_initialize(void)
 	if (pmc_callchaindepth <= 0 ||
 	    pmc_callchaindepth > PMC_CALLCHAIN_DEPTH_MAX) {
 		(void) printf("hwpmc: tunable \"callchaindepth\"=%d out of "
-		    "range.\n", pmc_callchaindepth);
-		pmc_callchaindepth = PMC_CALLCHAIN_DEPTH;
+		    "range - using %d.\n", pmc_callchaindepth,
+		    PMC_CALLCHAIN_DEPTH_MAX);
+		pmc_callchaindepth = PMC_CALLCHAIN_DEPTH_MAX;
 	}
 
 	md = pmc_md_initialize();