From owner-p4-projects@FreeBSD.ORG  Fri Jan  4 06:37:57 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C9C0416A41B; Fri,  4 Jan 2008 06:37:56 +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 7CBC816A417
	for <perforce@freebsd.org>; Fri,  4 Jan 2008 06:37:56 +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 53F2013C4EE
	for <perforce@freebsd.org>; Fri,  4 Jan 2008 06:37:56 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m046bubk047276
	for <perforce@freebsd.org>; Fri, 4 Jan 2008 06:37:56 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m046burb047273
	for perforce@freebsd.org; Fri, 4 Jan 2008 06:37:56 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 4 Jan 2008 06:37:56 GMT
Message-Id: <200801040637.m046burb047273@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 132460 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: Fri, 04 Jan 2008 06:37:57 -0000

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

Change 132460 by jb@jb_freebsd1 on 2008/01/04 06:37:39

	Fix a mismerge. I guess.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#12 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.c#12 (text) ====

@@ -235,12 +235,6 @@
 	 */
 	dtrace_close(g_dtp);
 
-	/*
-	 * Close the DTrace handle to ensure that any controlled processes are
-	 * correctly restored and continued.
-	 */
-	dtrace_close(g_dtp);
-
 	exit(E_ERROR);
 }