From owner-p4-projects@FreeBSD.ORG  Mon Aug 25 05:14:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1CC9A1065670; Mon, 25 Aug 2008 05:14:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D53A1106566B
	for <perforce@freebsd.org>; Mon, 25 Aug 2008 05:14:18 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DEB238FC18
	for <perforce@freebsd.org>; Mon, 25 Aug 2008 05:14:18 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7P5EIqX041842
	for <perforce@freebsd.org>; Mon, 25 Aug 2008 05:14:18 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7P5EIpn041840
	for perforce@freebsd.org; Mon, 25 Aug 2008 05:14:18 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 25 Aug 2008 05:14:18 GMT
Message-Id: <200808250514.m7P5EIpn041840@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148337 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Aug 2008 05:14:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=148337

Change 148337 by jb@freebsd3 on 2008/08/25 05:14:02

	Call callout_drain to finalise the callouts as the stage is being freed.

Affected files ...

.. //depot/projects/dtrace6/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 (text) ====

@@ -13618,8 +13618,8 @@
 	if (state->dts_deadman != CYCLIC_NONE)
 		cyclic_remove(state->dts_deadman);
 #else
-	callout_stop(&state->dts_cleaner);
-	callout_stop(&state->dts_deadman);
+	callout_drain(&state->dts_cleaner);
+	callout_drain(&state->dts_deadman);
 #endif
 
 	dtrace_dstate_fini(&vstate->dtvs_dynvars);