PERFORCE change 138770 for review
John Birrell
jb at FreeBSD.org
Thu Mar 27 18:06:38 PDT 2008
http://perforce.freebsd.org/chv.cgi?CH=138770
Change 138770 by jb at jb_freebsd1 on 2008/03/28 01:05:59
IFC
Affected files ...
.. //depot/projects/dtrace/src/cddl/Makefile.inc#9 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/assert.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/atomic.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/libintl.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/synch.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/thread.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch
.. //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#4 integrate
.. //depot/projects/dtrace/src/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/lib/libzpool/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/sbin/zfs/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/sbin/zpool/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/usr.bin/ztest/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/zdb/Makefile#3 integrate
.. //depot/projects/dtrace/src/compat/opensolaris/include/alloca.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/devid.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/fcntl.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/fsshare.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/libintl.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/mnttab.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/priv.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/solaris.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/stdio.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/stdlib.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/strings.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/unistd.h#4 delete
.. //depot/projects/dtrace/src/compat/opensolaris/include/zone.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/lib/libumem/umem.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/lib/libumem/umem.h#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/deviceid.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/fsshare.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/mkdirp.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/mnttab.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/zmount.c#2 delete
.. //depot/projects/dtrace/src/compat/opensolaris/misc/zone.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#7 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_misc.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_policy.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/rpc/xdr.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/acl.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/atomic.h#7 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/bitmap.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/byteorder.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/callb.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cmn_err.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpupart.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpuvar.h#9 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cred.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cyclic.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/debug.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/dirent.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/dkio.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/dnlc.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/elf.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kcondvar.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kmem.h#5 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kobj.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kstat.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/lock.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/misc.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mman.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mntent.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mnttab.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/modctl.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mount.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/mutex.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/objfs.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/param.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/pcpu.h#7 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/policy.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/proc.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/random.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/rwlock.h#3 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/stat.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/string.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/sunddi.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/sysmacros.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/systm.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/taskq.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/taskq_impl.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#6 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/types.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/uio.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/varargs.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vfs.h#2 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/vnode.h#4 delete
.. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/zone.h#2 delete
.. //depot/projects/dtrace/src/sys/modules/bktr/bktr/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/em/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/modules/igb/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/ixgbe/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/sound/driver/emu10kx/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/modules/uslcom/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/wpi/Makefile#3 integrate
.. //depot/projects/dtrace/src/sys/modules/zfs/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/netgraph/ng_base.c#17 integrate
.. //depot/projects/dtrace/src/sys/sys/buf.h#13 integrate
.. //depot/projects/dtrace/src/usr.bin/fstat/zfs/Makefile#4 integrate
Differences ...
==== //depot/projects/dtrace/src/cddl/Makefile.inc#9 (text+ko) ====
@@ -1,6 +1,6 @@
-# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $
+# $FreeBSD: src/cddl/Makefile.inc,v 1.4 2008/03/27 23:21:23 jb Exp $
-OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris
-OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris
+OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris
+OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
IGNORE_PRAGMA= YES
==== //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#3 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
+# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.3 2008/03/27 23:21:23 jb Exp $
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
LIB= avl
SRCS= avl.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
.include <bsd.lib.mk>
==== //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.4 2008/03/27 23:21:23 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
LIB= nvpair
@@ -10,8 +10,8 @@
nvpair_alloc_fixed.c \
nvpair.c
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
.include <bsd.lib.mk>
==== //depot/projects/dtrace/src/cddl/lib/libumem/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.3 2008/03/27 23:21:23 jb Exp $
-.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
LIB= umem
SRCS= umem.c
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
.include <bsd.lib.mk>
==== //depot/projects/dtrace/src/cddl/lib/libuutil/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.3 2008/03/27 23:21:24 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
LIB= uutil
SRCS= avl.c \
@@ -16,10 +16,10 @@
uu_strtoint.c
CFLAGS+= -DNATIVE_BUILD
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
.include <bsd.lib.mk>
==== //depot/projects/dtrace/src/cddl/lib/libzfs/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $
+# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.4 2008/03/27 23:21:24 jb Exp $
-.PATH: ${.CURDIR}/../../../compat/opensolaris/misc
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs
DPADD= ${LIBUTIL}
@@ -31,17 +31,17 @@
CFLAGS+= -DZFS_NO_ACL
CFLAGS+= -I${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
.include <bsd.lib.mk>
==== //depot/projects/dtrace/src/cddl/lib/libzpool/Makefile#2 (text+ko) ====
@@ -1,21 +1,21 @@
-# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.6 2008/03/27 23:21:24 jb Exp $
-.include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files"
+.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files"
# ZFS_COMMON_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
# ZFS_SHARED_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
# KERNEL_SRCS
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
# LIST_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os
# ATOMIC_SRCS
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= atomic.S
.else
-.PATH: ${.CURDIR}/../../../sys/compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern
ATOMIC_SRCS= opensolaris_atomic.c
.endif
@@ -29,17 +29,17 @@
SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS}
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
DPADD= ${LIBPTHREAD} ${LIBZ}
LDADD= -lpthread -lz
==== //depot/projects/dtrace/src/cddl/sbin/zfs/Makefile#3 (text+ko) ====
@@ -1,23 +1,23 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.4 2008/03/27 23:21:24 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
PROG= zfs
MAN= zfs.8
SRCS= zfs_main.c zfs_iter.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
==== //depot/projects/dtrace/src/cddl/sbin/zpool/Makefile#3 (text+ko) ====
@@ -1,23 +1,23 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.4 2008/03/27 23:21:24 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool
PROG= zpool
MAN= zpool.8
SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
==== //depot/projects/dtrace/src/cddl/usr.bin/ztest/Makefile#3 (text+ko) ====
@@ -1,18 +1,18 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.5 2008/03/27 23:21:24 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest
PROG= ztest
NO_MAN=
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
==== //depot/projects/dtrace/src/cddl/usr.sbin/zdb/Makefile#3 (text+ko) ====
@@ -1,19 +1,19 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.5 2008/03/27 23:21:25 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb
PROG= zdb
MAN= zdb.8
SRCS= zdb.c zdb_il.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
==== //depot/projects/dtrace/src/sys/modules/bktr/bktr/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/bktr/bktr/Makefile,v 1.9 2006/01/27 09:08:32 jmg Exp $
+# $FreeBSD: src/sys/modules/bktr/bktr/Makefile,v 1.10 2008/03/27 20:38:02 antoine Exp $
# Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device
@@ -6,7 +6,7 @@
KMOD= bktr
SRCS= bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c msp34xx.c \
- opt_devfs.h opt_bktr.h bus_if.h device_if.h \
+ opt_bktr.h bus_if.h device_if.h \
pci_if.h
CFLAGS+= -DBKTR_FREEBSD_MODULE
==== //depot/projects/dtrace/src/sys/modules/em/Makefile#6 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/modules/em/Makefile,v 1.10 2008/02/29 21:50:11 jfv Exp $
+# $FreeBSD: src/sys/modules/em/Makefile,v 1.11 2008/03/27 20:38:03 antoine Exp $
.PATH: ${.CURDIR}/../../dev/em
KMOD = if_em
-SRCS = device_if.h bus_if.h pci_if.h opt_bdg.h
+SRCS = device_if.h bus_if.h pci_if.h
SRCS += if_em.c $(SHARED_SRCS)
SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c
@@ -13,7 +13,7 @@
#CFLAGS += -DDEVICE_POLLING
clean:
- rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef*
+ rm -f device_if.h bus_if.h pci_if.h setdef*
rm -f *.o *.kld *.ko
rm -f @ machine
rm -f ${CLEANFILES}
==== //depot/projects/dtrace/src/sys/modules/igb/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-#$FreeBSD: src/sys/modules/igb/Makefile,v 1.1 2008/02/29 21:50:11 jfv Exp $
+#$FreeBSD: src/sys/modules/igb/Makefile,v 1.2 2008/03/27 20:38:03 antoine Exp $
.PATH: ${.CURDIR}/../../dev/igb
KMOD = if_igb
-SRCS = device_if.h bus_if.h pci_if.h opt_bdg.h
+SRCS = device_if.h bus_if.h pci_if.h
SRCS += if_igb.c $(SHARED_SRCS)
SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
SHARED_SRCS += e1000_82575.c
@@ -13,7 +13,7 @@
#CFLAGS += -DDEVICE_POLLING
clean:
- rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef*
+ rm -f device_if.h bus_if.h pci_if.h setdef*
rm -f *.o *.kld *.ko
rm -f @ machine
rm -f ${CLEANFILES}
==== //depot/projects/dtrace/src/sys/modules/ixgbe/Makefile#2 (text+ko) ====
@@ -1,14 +1,14 @@
-#$FreeBSD: src/sys/modules/ixgbe/Makefile,v 1.1 2007/09/04 02:31:35 jfv Exp $
+#$FreeBSD: src/sys/modules/ixgbe/Makefile,v 1.2 2008/03/27 20:38:03 antoine Exp $
.PATH: ${.CURDIR}/../../dev/ixgbe
KMOD = ixgbe
-SRCS = device_if.h bus_if.h pci_if.h opt_bdg.h
+SRCS = device_if.h bus_if.h pci_if.h
SRCS += ixgbe.c
# Shared source
SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_82598.c
CFLAGS+= -I${.CURDIR}/../../dev/ixgbe
clean:
- rm -f opt_bdg.h device_if.h bus_if.h pci_if.h setdef* *_StripErr
+ rm -f device_if.h bus_if.h pci_if.h setdef* *_StripErr
rm -f *.o *.kld *.ko
rm -f @ machine
==== //depot/projects/dtrace/src/sys/modules/sound/driver/emu10kx/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/sound/driver/emu10kx/Makefile,v 1.5 2008/02/21 11:09:59 ru Exp $
+# $FreeBSD: src/sys/modules/sound/driver/emu10kx/Makefile,v 1.6 2008/03/27 20:38:03 antoine Exp $
.PATH: ${.CURDIR}/../../../../dev/sound/pci \
${.CURDIR}/../../../../gnu/dev/sound/pci
@@ -6,7 +6,7 @@
SRCS= device_if.h bus_if.h pci_if.h
SRCS+= isa_if.h channel_if.h ac97_if.h mixer_if.h mpufoi_if.h
-SRCS+= vnode_if.h opt_emu10kx.h
+SRCS+= vnode_if.h
# Master, PCM and MIDI devices
SRCS+= emu10kx.c
SRCS+= emu10kx-pcm.c
==== //depot/projects/dtrace/src/sys/modules/uslcom/Makefile#2 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/modules/uslcom/Makefile,v 1.1 2008/03/05 14:13:30 rink Exp $
+# $FreeBSD: src/sys/modules/uslcom/Makefile,v 1.2 2008/03/27 20:38:03 antoine Exp $
S= ${.CURDIR}/../..
.PATH: $S/dev/usb
KMOD= uslcom
-SRCS= uslcom.c opt_usb.h opt_uslcom.h \
+SRCS= uslcom.c opt_usb.h \
device_if.h bus_if.h usbdevs.h
.include <bsd.kmod.mk>
==== //depot/projects/dtrace/src/sys/modules/wpi/Makefile#3 (text+ko) ====
@@ -1,8 +1,8 @@
-# $FreeBSD: src/sys/modules/wpi/Makefile,v 1.2 2007/11/08 22:02:38 benjsc Exp $
+# $FreeBSD: src/sys/modules/wpi/Makefile,v 1.3 2008/03/27 20:38:03 antoine Exp $
.PATH: ${.CURDIR}/../../dev/wpi
KMOD = if_wpi
-SRCS = if_wpi.c opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS = if_wpi.c device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
==== //depot/projects/dtrace/src/sys/modules/zfs/Makefile#6 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.9 2008/03/08 19:14:43 obrien Exp $
+# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.10 2008/03/27 23:21:25 jb Exp $
KMOD= zfs
SRCS= vnode_if.h
-SUNW= ${.CURDIR}/../../contrib/opensolaris
+SUNW= ${.CURDIR}/../../cddl/contrib/opensolaris
.PATH: ${SUNW}/common/acl
SRCS+= acl_common.c
@@ -13,7 +13,7 @@
.PATH: ${SUNW}/common/nvpair
SRCS+= nvpair.c
-.PATH: ${.CURDIR}/../../compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
SRCS+= opensolaris_kmem.c
SRCS+= opensolaris_kobj.c
SRCS+= opensolaris_kstat.c
@@ -27,7 +27,7 @@
.PATH: ${SUNW}/common/atomic/${MACHINE_ARCH}
SRCS+= atomic.S
.else
-.PATH: ${.CURDIR}/../../compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
SRCS+= opensolaris_atomic.c
.endif
@@ -70,7 +70,7 @@
# Use FreeBSD's namecache.
CFLAGS+=-DFREEBSD_NAMECACHE
-CFLAGS+=-I${.CURDIR}/../../compat/opensolaris
+CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
CFLAGS+=-I${SUNW}/uts/common/fs/zfs
CFLAGS+=-I${SUNW}/uts/common/zmod
CFLAGS+=-I${SUNW}/uts/common
==== //depot/projects/dtrace/src/sys/netgraph/ng_base.c#17 (text+ko) ====
@@ -38,7 +38,7 @@
* Authors: Julian Elischer <julian at freebsd.org>
* Archie Cobbs <archie at freebsd.org>
*
- * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.151 2008/03/16 23:12:17 mav Exp $
+ * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.152 2008/03/27 23:02:30 mav Exp $
* $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $
*/
@@ -1996,13 +1996,6 @@
* we don't need to change the PENDING flag.
*/
atomic_add_long(&ngq->q_flags, add_arg);
- /*
- * If we see more doable work, make sure we are
- * on the work queue.
- */
- if (NEXT_QUEUED_ITEM_CAN_PROCEED(ngq)) {
- ng_setisr(ngq->q_node);
- }
}
CTR6(KTR_NET, "%20s: node [%x] (%p) returning item %p as %s; "
"queue flags 0x%lx", __func__,
@@ -3385,10 +3378,6 @@
* All this time, keep the reference
* that lets us be sure that the node still exists.
* Let the reference go at the last minute.
- * ng_dequeue will put us back on the worklist
- * if there is more too do. This may be of use if there
- * are Multiple Processors and multiple Net threads in the
- * future.
*/
for (;;) {
int rw;
==== //depot/projects/dtrace/src/sys/sys/buf.h#13 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)buf.h 8.9 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/sys/buf.h,v 1.204 2008/03/22 09:15:16 jeff Exp $
+ * $FreeBSD: src/sys/sys/buf.h,v 1.205 2008/03/28 00:14:33 attilio Exp $
*/
#ifndef _SYS_BUF_H_
@@ -261,22 +261,22 @@
/*
* Initialize a lock.
*/
-#define BUF_LOCKINIT(bp) \
+#define BUF_LOCKINIT(bp) \
lockinit(&(bp)->b_lock, PRIBIO + 4, buf_wmesg, 0, 0)
/*
*
* Get a lock sleeping non-interruptably until it becomes available.
*/
static __inline int
-BUF_LOCK(struct buf *bp, int locktype, struct mtx *interlock);
-static __inline int
-BUF_LOCK(struct buf *bp, int locktype, struct mtx *interlock)
+_BUF_LOCK(struct buf *bp, int locktype, struct mtx *interlock, const char *file,
+ int line)
{
int res;
if (locktype & LK_INTERLOCK)
bp->b_waiters++;
- res = lockmgr(&bp->b_lock, locktype, interlock);
+ res = _lockmgr_args(&bp->b_lock, locktype, interlock, LK_WMESG_DEFAULT,
+ LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, file, line);
if (locktype & LK_INTERLOCK)
bp->b_waiters--;
return (res);
@@ -286,18 +286,15 @@
* Get a lock sleeping with specified interruptably and timeout.
*/
static __inline int
-BUF_TIMELOCK(struct buf *bp, int locktype, struct mtx *interlock,
- const char *wmesg, int catch, int timo);
-static __inline int
-BUF_TIMELOCK(struct buf *bp, int locktype, struct mtx *interlock,
- const char *wmesg, int catch, int timo)
+_BUF_TIMELOCK(struct buf *bp, int locktype, struct mtx *interlock,
+ const char *wmesg, int catch, int timo, const char *file, int line)
{
int res;
if (locktype & LK_INTERLOCK)
bp->b_waiters++;
- res = lockmgr_args(&bp->b_lock, locktype | LK_TIMELOCK, interlock,
- wmesg, (PRIBIO + 4) | catch, timo);
+ res = _lockmgr_args(&bp->b_lock, locktype | LK_TIMELOCK, interlock,
+ wmesg, (PRIBIO + 4) | catch, timo, file, line);
if (locktype & LK_INTERLOCK)
bp->b_waiters--;
return (res);
@@ -307,35 +304,40 @@
* Release a lock. Only the acquiring process may free the lock unless
* it has been handed off to biodone.
*/
-static __inline void BUF_UNLOCK(struct buf *);
-static __inline void
-BUF_UNLOCK(struct buf *bp)
-{
- int s;
+#define BUF_UNLOCK(bp) do { \
+ KASSERT(((bp)->b_flags & B_REMFREE) == 0, \
+ ("BUF_UNLOCK %p while B_REMFREE is still set.", (bp))); \
+ \
+ (void)_lockmgr_args(&(bp)->b_lock, LK_RELEASE, NULL, \
+ LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, \
+ LOCK_FILE, LOCK_LINE); \
+} while (0)
- s = splbio();
- KASSERT((bp->b_flags & B_REMFREE) == 0,
- ("BUF_UNLOCK %p while B_REMFREE is still set.", bp));
- lockmgr(&(bp)->b_lock, LK_RELEASE, NULL);
- splx(s);
-}
-
/*
* Check if a buffer lock is recursed.
*/
#define BUF_LOCKRECURSED(bp) \
- (lockmgr_recursed(&(bp)->b_lock))
+ lockmgr_recursed(&(bp)->b_lock)
/*
* Check if a buffer lock is currently held.
*/
#define BUF_ISLOCKED(bp) \
- (lockstatus(&(bp)->b_lock))
+ lockstatus(&(bp)->b_lock)
/*
* Free a buffer lock.
*/
#define BUF_LOCKFREE(bp) \
- (lockdestroy(&(bp)->b_lock))
+ lockdestroy(&(bp)->b_lock)
+
+/*
+ * Use macro wrappers in order to exploit consumers tracking.
+ */
+#define BUF_LOCK(bp, locktype, interlock) \
+ _BUF_LOCK((bp), (locktype), (interlock), LOCK_FILE, LOCK_LINE)
+#define BUF_TIMELOCK(bp, locktype, interlock, wmesg, catch, timo) \
+ _BUF_TIMELOCK((bp), (locktype), (interlock), (wmesg), (catch), \
+ (timo), LOCK_FILE, LOCK_LINE)
/*
* Buffer lock assertions.
@@ -349,10 +351,8 @@
_lockmgr_assert(&(bp)->b_lock, KA_XLOCKED, LOCK_FILE, LOCK_LINE)
#define BUF_ASSERT_UNLOCKED(bp) \
_lockmgr_assert(&(bp)->b_lock, KA_UNLOCKED, LOCK_FILE, LOCK_LINE)
-#define BUF_ASSERT_HELD(bp) \
- _lockmgr_assert(&(bp)->b_lock, KA_HELD, LOCK_FILE, LOCK_LINE)
-#define BUF_ASSERT_UNHELD(bp) \
- _lockmgr_assert(&(bp)->b_lock, KA_UNHELD, LOCK_FILE, LOCK_LINE)
+#define BUF_ASSERT_HELD(bp)
+#define BUF_ASSERT_UNHELD(bp)
#else
#define BUF_ASSERT_LOCKED(bp)
#define BUF_ASSERT_SLOCKED(bp)
@@ -369,13 +369,8 @@
* original owning process can no longer acquire it recursively, but must
* wait until the I/O is completed and the lock has been freed by biodone.
*/
-static __inline void BUF_KERNPROC(struct buf *);
-static __inline void
-BUF_KERNPROC(struct buf *bp)
-{
-
- lockmgr_disown(&bp->b_lock);
-}
+#define BUF_KERNPROC(bp) \
+ _lockmgr_disown(&(bp)->b_lock, LOCK_FILE, LOCK_LINE)
#endif
#endif /* _KERNEL */
==== //depot/projects/dtrace/src/usr.bin/fstat/zfs/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.bin/fstat/zfs/Makefile,v 1.3 2008/01/24 07:24:30 ru Exp $
+# $FreeBSD: src/usr.bin/fstat/zfs/Makefile,v 1.4 2008/03/27 23:21:25 jb Exp $
.PATH: ${.CURDIR}/..
@@ -6,14 +6,14 @@
OBJS= zfs.o
WARNS?= 1
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/..
all: ${OBJS}
More information about the p4-projects
mailing list