Author: markj
Date: Fri Sep 11 02:53:22 2015
New Revision: 287639
URL: https://svnweb.freebsd.org/changeset/base/287639
Log:
MFC r274569, r276848, r287234:
Only compare visitation counters if they've both been set for the current
type graph walk.
Modified:
stable/10/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Fri Sep 11
00:38:58 2015 (r287638)
+++ stable/10/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Fri Sep 11
02:53:22 2015 (r287639)
@@ -357,7 +357,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp,
int (*equiv)(tdesc_t *, tdesc_t *, equiv_data_t *);
int mapping;
- if (ctdp->t_emark > ed->ed_clear_mark ||
+ if (ctdp->t_emark > ed->ed_clear_mark &&
mtdp->t_emark > ed->ed_clear_mark)
return (ctdp->t_emark == mtdp->t_emark);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
