diff options
| author | markj <markj@FreeBSD.org> | 2015-01-08 18:45:16 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-01-08 18:45:16 +0000 |
| commit | b4e2db0e20bb2de699a7d5a3411d1d8380fc35ea (patch) | |
| tree | 71ff62538bde32e46be669e176effb10ef467b9c /cddl | |
| parent | 4b0aa49e7d9c7096608a3de3c081e96a558f009f (diff) | |
| download | FreeBSD-src-b4e2db0e20bb2de699a7d5a3411d1d8380fc35ea.zip FreeBSD-src-b4e2db0e20bb2de699a7d5a3411d1d8380fc35ea.tar.gz | |
Revert r274569. It seems to be causing a crash when merging CTF data for
recent i386 GENERIC kernels.
Reported by: David Wolfskill
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 d366f31..27966af 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c @@ -349,7 +349,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); |
