From owner-p4-projects@FreeBSD.ORG Thu May 22 08:46:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED9DA106567C; Thu, 22 May 2008 08:46:15 +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 AF3FE1065670 for ; Thu, 22 May 2008 08:46:15 +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 9B9A38FC1E for ; Thu, 22 May 2008 08:46:15 +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 m4M8kFtj098590 for ; Thu, 22 May 2008 08:46:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4M8kFop098588 for perforce@freebsd.org; Thu, 22 May 2008 08:46:15 GMT (envelope-from jb@freebsd.org) Date: Thu, 22 May 2008 08:46:15 GMT Message-Id: <200805220846.m4M8kFop098588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 142033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2008 08:46:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=142033 Change 142033 by jb@freebsd3 on 2008/05/22 08:46:10 IFC Affected files ... .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/sys/ctf.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#2 delete .. //depot/projects/dtrace/src/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#2 delete .. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#8 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#16 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#8 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#13 integrate .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#12 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#3 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#4 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#2 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#4 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#2 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/pcpu.h#3 integrate .. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sema.h#2 integrate Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.8 2008/03/29 17:44:40 ru Exp $ +# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.9 2008/05/22 08:04:48 jb Exp $ .include ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#16 (text+ko) ==== ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#8 (text+ko) ==== ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#13 (text+ko) ==== ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#12 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/atomic.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.3 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.4 2008/05/22 08:33:24 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cmn_err.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cmn_err.h,v 1.3 2008/05/22 08:33:24 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_CMN_ERR_H_ ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.3 2008/04/22 07:42:59 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.4 2008/05/22 08:33:24 jb Exp $ */ /* ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cyclic.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cyclic.h,v 1.3 2008/05/22 08:33:24 jb Exp $ * */ /* ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#2 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/kmem.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/kmem.h,v 1.5 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/kmem.h,v 1.6 2008/05/22 08:33:24 jb Exp $ */ #ifndef _OPENSOLARIS_SYS_KMEM_H_ ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/pcpu.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/pcpu.h,v 1.2 2008/03/28 22:16:06 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/pcpu.h,v 1.3 2008/05/22 08:33:24 jb Exp $ * */ ==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sema.h#2 (text+ko) ====