d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r274569. It seems to be causing a crash when merging CTF data for

Browse Source 
recent i386 GENERIC kernels.

Reported by:	David Wolfskill
This commit is contained in:
Mark Johnston 2015-01-08 18:45:16 +00:00
parent abc1be9062
commit db3cb3640f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=276848
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cddl/contrib/opensolaris/tools/ctf/cvt/merge.c
View File

@ -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);