diff options
| author | markj <markj@FreeBSD.org> | 2015-04-24 03:19:30 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-04-24 03:19:30 +0000 |
| commit | 9385b9197d9e2f0ef0c688089a8ac1653b0fe6e4 (patch) | |
| tree | 248a516b2a860a6dbf88a5b43d66dadf6063b847 /sys/cddl/contrib/opensolaris/uts/common/dtrace | |
| parent | f924bf61f49f76fb7e56b3d80d385ce10619dae7 (diff) | |
| download | FreeBSD-src-9385b9197d9e2f0ef0c688089a8ac1653b0fe6e4.zip FreeBSD-src-9385b9197d9e2f0ef0c688089a8ac1653b0fe6e4.tar.gz | |
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.
Differential Revision: https://reviews.freebsd.org/D2349
Reviewed by: avg
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/dtrace')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index dc7c283..b31e8bb 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -611,7 +611,11 @@ dtrace_panic(const char *format, ...) va_list alist; va_start(alist, format); +#ifdef __FreeBSD__ + vpanic(format, alist); +#else dtrace_vpanic(format, alist); +#endif va_end(alist); } |
