diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2015-01-08 18:45:16 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2015-01-08 18:45:16 +0000 |
| commit | db3cb3640f547c063293e9fdc4db69e9dc120951 (patch) | |
| tree | 71ff62538bde32e46be669e176effb10ef467b9c /cddl | |
| parent | abc1be9062673f5a5cf28a1dd410caba625d7746 (diff) | |
| download | src-db3cb3640f547c063293e9fdc4db69e9dc120951.tar.gz src-db3cb3640f547c063293e9fdc4db69e9dc120951.zip | |
Revert r274569. It seems to be causing a crash when merging CTF data for
recent i386 GENERIC kernels.
Reported by: David Wolfskill
Notes
Notes:
svn path=/head/; revision=276848
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 d366f3182731..27966af0cf50 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); |