svn commit: r288460 - in stable: 10/sys/dev/hwpmc 9/sys/dev/hwpmc

[John Baldwin]

Author: jhb
Date: Thu Oct  1 20:49:10 2015
New Revision: 288460
URL: https://svnweb.freebsd.org/changeset/base/288460

Log:
  MFC 283121:
  Use the proper mask when reloading sampling PMCs for Core CPUs.

Modified:
  stable/9/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/dev/hwpmc/hwpmc_core.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/9/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_core.c	Thu Oct  1 19:48:10 2015	(r288459)
+++ stable/9/sys/dev/hwpmc/hwpmc_core.c	Thu Oct  1 20:49:10 2015	(r288460)
@@ -2458,7 +2458,7 @@ core_intr(int cpu, struct trapframe *tf)
 		    TRAPF_USERMODE(tf));
 
 		v = pm->pm_sc.pm_reloadcount;
-		v = iaf_reload_count_to_perfctr_value(v);
+		v = iap_reload_count_to_perfctr_value(v);
 
 		/*
 		 * Stop the counter, reload it but only restart it if