Module Name: src
Committed By: martin
Date: Sun Jul 10 10:00:20 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/dtrace [netbsd-7]: dtrace_hacks.c
src/external/cddl/osnet/dev/dtrace/amd64 [netbsd-7]: dtrace_asm.S
src/external/cddl/osnet/dist/uts/common/dtrace [netbsd-7]: dtrace.c
src/external/cddl/osnet/sys/kern [netbsd-7]: string.c
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1189):
external/cddl/osnet/sys/kern/string.c: revision 1.3
external/cddl/osnet/dev/dtrace/dtrace_hacks.c: revision 1.5
external/cddl/osnet/dist/uts/common/dtrace/dtrace.c: revision 1.32
external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S: revision 1.6
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
On NetBSD we already have strpbrk() in libkern, so we don't need to
provide another copy in the module. Removes another 'redefined symbol'
error when loading the module.
Related to PR kern/51265
One more removal of a redefined symbol while loading dtrace module.
Should finish the issues with PR kern/51265
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.24.1 \
src/external/cddl/osnet/dev/dtrace/dtrace_hacks.c
cvs rdiff -u -r1.4 -r1.4.10.1 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S
cvs rdiff -u -r1.28 -r1.28.2.1 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.2 -r1.2.24.1 src/external/cddl/osnet/sys/kern/string.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
