From db3cb3640f547c063293e9fdc4db69e9dc120951 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Thu, 8 Jan 2015 18:45:16 +0000 Subject: [PATCH] Revert r274569. It seems to be causing a crash when merging CTF data for recent i386 GENERIC kernels. Reported by: David Wolfskill --- cddl/contrib/opensolaris/tools/ctf/cvt/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);