svn commit: r278813 - stable/10/sys/dev/hwpmc

[Ed Maste]

Author: emaste
Date: Sun Feb 15 20:55:26 2015
New Revision: 278813
URL: https://svnweb.freebsd.org/changeset/base/278813

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

Modified:
  stable/10/sys/dev/hwpmc/hwpmc_mod.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/hwpmc/hwpmc_mod.c
==============================================================================
--- stable/10/sys/dev/hwpmc/hwpmc_mod.c	Sun Feb 15 20:53:50 2015	(r278812)
+++ stable/10/sys/dev/hwpmc/hwpmc_mod.c	Sun Feb 15 20:55:26 2015	(r278813)
@@ -4753,8 +4753,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();