svn commit: r206122 - stable/7/sys/dev/hwpmc
Fabien Thomas
fabient at FreeBSD.org
Sat Apr 3 07:19:32 UTC 2010
Author: fabient
Date: Sat Apr 3 07:19:31 2010
New Revision: 206122
URL: http://svn.freebsd.org/changeset/base/206122
Log:
MFC r205998:
If there is multiple PMCs for the same interrupt ignore new post.
This will indirectly fix a bug where the thread will be pinned
forever if the assert is not compiled.
Modified:
stable/7/sys/dev/hwpmc/hwpmc_mod.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/hwpmc/hwpmc_mod.c
==============================================================================
--- stable/7/sys/dev/hwpmc/hwpmc_mod.c Sat Apr 3 07:12:35 2010 (r206121)
+++ stable/7/sys/dev/hwpmc/hwpmc_mod.c Sat Apr 3 07:19:31 2010 (r206122)
@@ -3976,9 +3976,11 @@ pmc_post_callchain_callback(void)
td = curthread;
- KASSERT((td->td_pflags & TDP_CALLCHAIN) == 0,
- ("[pmc,%d] thread %p already marked for callchain capture",
- __LINE__, (void *) td));
+ /*
+ * If there is multiple PMCs for the same interrupt ignore new post
+ */
+ if (td->td_pflags & TDP_CALLCHAIN)
+ return;
/*
* Mark this thread as needing callchain capture.
More information about the svn-src-all
mailing list