Author: markj
Date: Thu Jan 8 18:45:16 2015
New Revision: 276848
URL: https://svnweb.freebsd.org/changeset/base/276848
Log:
Revert r274569. It seems to be causing a crash when merging CTF data for
recent i386 GENERIC kernels.
Reported by: David Wolfskill
Modified:
head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Thu Jan 8 18:29:54
2015 (r276847)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c Thu Jan 8 18:45:16
2015 (r276848)
@@ -349,7 +349,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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
