svn commit: r310064 - stable/11/sys/dev/hwpmc
Andriy Gapon
avg at FreeBSD.org
Wed Dec 14 16:04:05 UTC 2016
Author: avg
Date: Wed Dec 14 16:04:04 2016
New Revision: 310064
URL: https://svnweb.freebsd.org/changeset/base/310064
Log:
MFC r308480: pmc_process_csw_out: ignore deleted counters
Modified:
stable/11/sys/dev/hwpmc/hwpmc_mod.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/hwpmc/hwpmc_mod.c
==============================================================================
--- stable/11/sys/dev/hwpmc/hwpmc_mod.c Wed Dec 14 16:03:23 2016 (r310063)
+++ stable/11/sys/dev/hwpmc/hwpmc_mod.c Wed Dec 14 16:04:04 2016 (r310064)
@@ -1431,8 +1431,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));
More information about the svn-src-stable-11
mailing list