From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 05:33:28 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2B95016A4E1; Fri, 14 Jul 2006 05:33:28 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C9FE616A4DF
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:33:27 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 811FB43D46
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:33:27 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6E5XRWM035722
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:33:27 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6E5XRRi035719
	for perforce@freebsd.org; Fri, 14 Jul 2006 05:33:27 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Jul 2006 05:33:27 GMT
Message-Id: <200607140533.k6E5XRRi035719@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 101520 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, 14 Jul 2006 05:33:28 -0000

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

Change 101520 by jb@jb_freebsd2 on 2006/07/14 05:33:07

	Fix an integration mishap.

Affected files ...

.. //depot/projects/dtrace/src/lib/libthr/sys/thr_error.c#5 edit

Differences ...

==== //depot/projects/dtrace/src/lib/libthr/sys/thr_error.c#5 (text+ko) ====

@@ -51,7 +51,6 @@
 		curthread = _get_curthread();
 		if (curthread != NULL && curthread != _thr_initial)
 			return (&curthread->error);
-	} else
 	}
 	return (&errno);
 }