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

[Andriy Gapon]

Author: avg
Date: Wed Dec 14 16:03:23 2016
New Revision: 310063
URL: https://svnweb.freebsd.org/changeset/base/310063

Log:
  MFC r308480: pmc_process_csw_out: ignore deleted counters

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	Wed Dec 14 15:38:28 2016	(r310062)
+++ stable/10/sys/dev/hwpmc/hwpmc_mod.c	Wed Dec 14 16:03:23 2016	(r310063)
@@ -1432,8 +1432,8 @@ pmc_process_csw_out(struct thread *td)
 		 * save the reading.
 		 */
 
-		if (pp != NULL && pp->pp_pmcs[ri].pp_pmc != NULL) {
-
+		if (pm->pm_state != PMC_STATE_DELETED && pp != NULL &&
+		    pp->pp_pmcs[ri].pp_pmc != NULL) {
 			KASSERT(pm == pp->pp_pmcs[ri].pp_pmc,
 			    ("[pmc,%d] pm %p != pp_pmcs[%d] %p", __LINE__,
 				pm, ri, pp->pp_pmcs[ri].pp_pmc));