Date: Tue, 22 Apr 2008 22:55:52 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 140434 for review Message-ID: <200804222255.m3MMtqRN015266@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=140434 Change 140434 by jb@freebsd3 on 2008/04/22 22:54:54 IFdtrace Affected files ... .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/devid.h#4 integrate .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libintl.h#4 integrate .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/mnttab.h#4 integrate .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/priv.h#4 integrate .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/solaris.h#4 integrate .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/zone.h#4 integrate .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.c#4 integrate .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.h#4 integrate .. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mkdirp.c#4 integrate .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/amd64/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/i386/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparc/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparcv9/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i386/Makefile#2 delete .. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/Makefile#2 delete .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/rpc/xdr.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/acl.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/byteorder.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/callb.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dkio.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mntent.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq.h#4 integrate .. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#4 integrate Differences ... ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/devid.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.3.2.2 2008/04/22 09:21:27 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.4 2008/04/22 07:42:58 jb Exp $ */ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libintl.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */ #ifndef _LIBINTL_H_ #define _LIBINTL_H_ ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/mnttab.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */ #ifndef _OPENSOLARIS_MNTTAB_H_ #define _OPENSOLARIS_MNTTAB_H_ ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/priv.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */ #ifndef _OPENSOLARIS_PRIV_H_ #define _OPENSOLARIS_PRIV_H_ ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/solaris.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */ #ifndef _SOLARIS_H_ #define _SOLARIS_H_ ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/zone.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */ +/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */ #ifndef _ZONE_H_ #define _ZONE_H_ ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* * Copyright 2006 Ricardo Correia. All rights reserved. ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. ==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mkdirp.c#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ + * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* Copyright (c) 1988 AT&T */ ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c,v 1.3.2.2 2008/04/22 09:21:28 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c,v 1.4 2008/04/22 07:42:59 jb Exp $ */ /* * Copyright 2007 Sun Microsystems, Inc. All rights reserved. ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/rpc/xdr.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.3.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $ */ /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. @@ -52,19 +52,6 @@ #define xdr_control(a,b,c) xdrmem_control(a,b,c) /* - * These are XDR control operators - */ - -#define XDR_GET_BYTES_AVAIL 1 - -struct xdr_bytesrec { - bool_t xc_is_last_record; - size_t xc_num_avail; -}; - -typedef struct xdr_bytesrec xdr_bytesrec; - -/* * These are the request arguments to XDR_CONTROL. * * XDR_PEEK - returns the contents of the next XDR unit on the XDR stream. ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/acl.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/acl.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/acl.h,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 (text+ko) ==== @@ -17,6 +17,8 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END + * + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/bitmap.h,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/byteorder.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/byteorder.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/byteorder.h,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/callb.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/callb.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/callb.h,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 (text+ko) ==== @@ -17,6 +17,8 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END + * + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpupart.h,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 (text+ko) ==== @@ -17,6 +17,8 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END + * + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dkio.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dkio.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dkio.h,v 1.3 2008/04/22 07:42:59 jb Exp $ */ /* * Copyright 2006 Sun Microsystems, Inc. All rights reserved. ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mntent.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mntent.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mntent.h,v 1.3 2008/04/22 07:43:00 jb Exp $ */ /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 (text+ko) ==== @@ -17,6 +17,8 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END + * + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/objfs.h,v 1.3 2008/04/22 07:43:00 jb Exp $ */ #ifndef _COMPAT_OPENSOLARIS_SYS_OBJFS_H ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.3 2008/04/22 07:43:00 jb Exp $ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq.h,v 1.3 2008/04/22 07:43:00 jb Exp $ */ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved. ==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq_impl.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq_impl.h,v 1.3 2008/04/22 07:43:00 jb Exp $ */ /* * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804222255.m3MMtqRN015266>