Module Name: src Committed By: pgoyette Date: Thu Jun 23 04:35:35 UTC 2016
Modified Files: src/external/cddl/osnet/dev/dtrace: dtrace_hacks.c src/external/cddl/osnet/dev/dtrace/amd64: dtrace_asm.S src/external/cddl/osnet/dev/dtrace/arm: dtrace_asm.S src/external/cddl/osnet/dev/dtrace/i386: dtrace_asm.S src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c Log Message: Import fix from FreeBSD - see [1], [2] references below... Fix DTrace's panic() action. It would previously call into some unfinished Solaris compatibility code and return without actually calling panic(9). The compatibility code is unneeded, however, so just remove it and have dtrace_panic() call vpanic(9) directly. Fixes immediate problem in PR-51265. However, this now reveals another redefined symbol 'strpbrk' in the required module "solaris". [1] https://svnweb.freebsd.org/changeset/base/281916 [2] http://lists.freebsd.org/pipermail/svn-src-head/2015-April/071019.html To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c cvs rdiff -u -r1.5 -r1.6 \ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dev/dtrace/arm/dtrace_asm.S cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S cvs rdiff -u -r1.31 -r1.32 \ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.