23c23
< * $FreeBSD: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c 247049 2013-02-20 17:55:17Z gibbs $
---
> * $FreeBSD: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c 248983 2013-04-01 19:13:46Z pfg $
177a178,180
> /*
> * Copyright (c) 2011, Joyent, Inc. All rights reserved.
> */
320c323
< int i, later = 0;
---
> int i, later = 0, rval;
381c384
< if (dtrace_unregister(provid) != 0) {
---
> if ((rval = dtrace_unregister(provid)) != 0) {
383a387,390
>
> if (rval == EAGAIN)
> fp->ftp_marked = 1;
>
411,413c418,423
< if (later > 0 && callout_active(&fasttrap_timeout))
< callout_reset(&fasttrap_timeout, hz, &fasttrap_pid_cleanup_cb,
< NULL);
---
> if (later > 0) {
> if (callout_active(&fasttrap_timeout)) {
> callout_reset(&fasttrap_timeout, hz,
> &fasttrap_pid_cleanup_cb, NULL);
> }
>
416c426
< else {
---
> } else {