From owner-cvs-src-old@FreeBSD.ORG  Mon Aug  2 17:21:08 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 864F81065675
	for <cvs-src-old@freebsd.org>; Mon,  2 Aug 2010 17:21:08 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 735898FC15
	for <cvs-src-old@freebsd.org>; Mon,  2 Aug 2010 17:21:08 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o72HL8Px024193
	for <cvs-src-old@freebsd.org>; Mon, 2 Aug 2010 17:21:08 GMT
	(envelope-from rpaulo@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o72HL8Ol024192
	for cvs-src-old@freebsd.org; Mon, 2 Aug 2010 17:21:08 GMT
	(envelope-from rpaulo@repoman.freebsd.org)
Message-Id: <201008021721.o72HL8Ol024192@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	rpaulo@repoman.freebsd.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 2 Aug 2010 17:20:59 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/cddl/contrib/opensolaris/lib/libdtrace/common
	dt_pid.c dt_proc.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Aug 2010 17:21:08 -0000

rpaulo      2010-08-02 17:20:59 UTC

  FreeBSD src repository

  Modified files:
    cddl/contrib/opensolaris/lib/libdtrace/common dt_pid.c 
                                                  dt_proc.c 
  Log:
  SVN rev 210775 on 2010-08-02 17:20:59Z by rpaulo
  
  Fix the result of a mismerge. MUTEX_HELD should be DT_MUTEX_HELD() and
  Plmid() is not supposed to be called.
  
  Revision  Changes    Path
  1.4       +3 -1      src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  1.7       +8 -8      src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c