diff options
| author | markj <markj@FreeBSD.org> | 2015-09-11 02:53:22 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-09-11 02:53:22 +0000 |
| commit | 16ff73dbec5b712d9c2db0b086d1bd8b16bb2f69 (patch) | |
| tree | 32e24e9835d0770123458607c0c01bd78d2738f4 /cddl | |
| parent | ffc8f26a94deef53f6b86b7c5bd98591a9dd6231 (diff) | |
| download | FreeBSD-src-16ff73dbec5b712d9c2db0b086d1bd8b16bb2f69.zip FreeBSD-src-16ff73dbec5b712d9c2db0b086d1bd8b16bb2f69.tar.gz | |
MFC r274569, r276848, r287234:
Only compare visitation counters if they've both been set for the current
type graph walk.
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/tools/ctf/cvt/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c index 2ef37d4..26b8d82 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c @@ -357,7 +357,7 @@ equiv_node(tdesc_t *ctdp, tdesc_t *mtdp, equiv_data_t *ed) 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); |
