20 files changed, 428 insertions, 28 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 847cb91b3e48..756d2d986451 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -66,6 +66,7 @@ SUBDIR=	${_3dfx} \
 	cue \
 	cxgb \
 	${_cx} \
+	${_cyclic} \
 	dc \
 	dcons \
 	dcons_crom \
@@ -73,6 +74,7 @@ SUBDIR=	${_3dfx} \
 	${_digi} \
 	${_dpt} \
 	${_drm} \
+	${_dtrace} \
 	dummynet \
 	${_ed} \
 	${_elink} \
@@ -204,6 +206,7 @@ SUBDIR=	${_3dfx} \
 	${_nvram} \
 	${_nwfs} \
 	${_oltr} \
+	${_opensolaris} \
 	${_padlock} \
 	patm \
 	${_pccard} \
@@ -390,8 +393,14 @@ _coff=		coff
 _cp=		cp
 _cpufreq=	cpufreq
 _cs=		cs
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_cyclic=	cyclic
+.endif
 _digi=		digi
 _drm=		drm
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_dtrace=	dtrace
+.endif
 _ed=		ed
 _elink=		elink
 _em=		em
@@ -423,6 +432,9 @@ _nsp=		nsp
 _nwfs=		nwfs
 .endif
 _oltr=		oltr
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_opensolaris=	opensolaris
+.endif
 _pccard=	pccard
 _pcfclock=	pcfclock
 _pecoff=	pecoff
@@ -518,8 +530,14 @@ _cmx=		cmx
 _ciss=		ciss
 _coretemp=	coretemp
 _cpufreq=	cpufreq
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_cyclic=	cyclic
+.endif
 _digi=		digi
 _drm=		drm
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_dtrace=	dtrace
+.endif
 _ed=		ed
 _et=		et
 _em=		em
@@ -550,6 +568,9 @@ _nfe=		nfe
 _nve=		nve
 _nvram=		nvram
 _nxge=		nxge
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+_opensolaris=	opensolaris
+.endif
 _pccard=	pccard
 _rdma=		rdma	
 _safe=		safe
diff --git a/sys/modules/cyclic/Makefile b/sys/modules/cyclic/Makefile
new file mode 100644
index 000000000000..db99488e138b
--- /dev/null
+++ b/sys/modules/cyclic/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../cddl/dev/cyclic
+
+KMOD=		cyclic
+SRCS=		cyclic.c
+		
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../cddl/compat/opensolaris		\
+		-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common	\
+		-I${.CURDIR}/../..					\
+		-I${.CURDIR}/../../cddl/dev/cyclic/${MACHINE_ARCH}
+
+CFLAGS+=	-DDEBUG=1
+
+IGNORE_PRAGMA=	1
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/cyclic_test/Makefile b/sys/modules/cyclic_test/Makefile
new file mode 100644
index 000000000000..e4a7c8679adb
--- /dev/null
+++ b/sys/modules/cyclic_test/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../cddl/dev/cyclic
+
+KMOD=		cyclic_test
+SRCS=		cyclic_test.c
+		
+#SRCS+=		bus_if.h device_if.h vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../cddl/compat/opensolaris		\
+		-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common	\
+		-I${.CURDIR}/../..
+
+IGNORE_PRAGMA=	1
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile
new file mode 100644
index 000000000000..45c2b2f0d406
--- /dev/null
+++ b/sys/modules/dtrace/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+.include "Makefile.inc"
+
+SUBDIR=		dtmalloc	\
+		dtrace		\
+		dtraceall	\
+		dtrace_test	\
+		profile		\
+		prototype	\
+		sdt		\
+		systrace
+
+.if ${MACHINE_ARCH} == "amd64"
+SUBDIR+=	fbt
+.elif ${MACHINE_ARCH} == "i386"
+SUBDIR+=	fbt
+.endif
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/dtrace/Makefile.inc b/sys/modules/dtrace/Makefile.inc
new file mode 100644
index 000000000000..c35764b2998b
--- /dev/null
+++ b/sys/modules/dtrace/Makefile.inc
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+IGNORE_PRAGMA=	1
+
+load	:
+	-kldload cyclic
+	-kldload dtrace
+.if ${MACHINE_ARCH} == "i386"
+	-kldload sdt
+	-kldload lockstat
+	-kldload fbt
+	-kldload prototype
+.endif
+	-kldload profile
+	-kldload systrace
+	kldstat
+
+unload	:
+	-kldunload systrace
+	-kldunload profile
+.if ${MACHINE_ARCH} == "i386"
+	-kldunload prototype
+	-kldunload fbt
+	-kldunload lockstat
+	-kldunload sdt
+.endif
+	-kldunload dtrace
+	-kldunload cyclic
+	kldstat
diff --git a/sys/modules/dtrace/dtmalloc/Makefile b/sys/modules/dtrace/dtmalloc/Makefile
new file mode 100644
index 000000000000..efb260763fa2
--- /dev/null
+++ b/sys/modules/dtrace/dtmalloc/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/dtmalloc
+
+KMOD=		dtmalloc
+SRCS=		dtmalloc.c
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
new file mode 100644
index 000000000000..5d16800a8fd1
--- /dev/null
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -0,0 +1,44 @@
+# $FreeBSD$
+
+ARCHDIR=	${MACHINE_ARCH}
+
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace
+.PATH: ${.CURDIR}/../../../cddl/kern
+.PATH: ${.CURDIR}/../../../cddl/dev/dtrace
+.PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR}
+
+KMOD=		dtrace
+SRCS=		dtrace.c \
+		dtrace_asm.S \
+		dtrace_subr.c
+
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+SRCS+=		dis_tables.c \
+		instr_size.c
+.endif
+
+SRCS+=		bus_if.h device_if.h vnode_if.h
+
+# Needed for dtrace_asm.S
+SRCS+=		assym.s
+
+# These are needed for assym.s
+SRCS+=		opt_compat.h opt_kstack_pages.h opt_nfs.h
+
+.if ${MACHINE_ARCH} == "i386"
+SRCS+=		opt_apic.h
+.endif
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/dev/dtrace \
+		-I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../.. -DDIS_MEM
+
+CFLAGS+=	-DSMP -DDEBUG
+
+EXPORT_SYMS=	dtrace_register \
+		dtrace_unregister \
+		dtrace_probe_lookup
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/dtrace_test/Makefile b/sys/modules/dtrace/dtrace_test/Makefile
new file mode 100644
index 000000000000..bc096f3a7398
--- /dev/null
+++ b/sys/modules/dtrace/dtrace_test/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/dtrace
+
+KMOD=		dtrace_test
+SRCS=		dtrace_test.c
+
+SRCS+=		vnode_if.h
+		
+CFLAGS+=	-I${.CURDIR}/../../..
+
+CFLAGS+=	-D_KERNEL
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/dtraceall/Makefile b/sys/modules/dtrace/dtraceall/Makefile
new file mode 100644
index 000000000000..6f098024611c
--- /dev/null
+++ b/sys/modules/dtrace/dtraceall/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+KMOD=		dtraceall
+SRCS=		dtraceall.c
+
+CFLAGS+=	-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c
new file mode 100644
index 000000000000..4f7bdfed5613
--- /dev/null
+++ b/sys/modules/dtrace/dtraceall/dtraceall.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2008 John Birrell <jb@freebsd.org>
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/cdefs.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/errno.h>
+
+static int
+dtraceall_modevent(module_t mod __unused, int type, void *data __unused)
+{
+	int error = 0;
+
+	switch (type) {
+	case MOD_LOAD:
+		break;
+
+	case MOD_UNLOAD:
+		break;
+
+	case MOD_SHUTDOWN:
+		break;
+
+	default:
+		error = EOPNOTSUPP;
+		break;
+
+	}
+
+	return (error);
+}
+
+DEV_MODULE(dtraceall, dtraceall_modevent, NULL);
+MODULE_VERSION(dtraceall, 1);
+
+/* All the DTrace modules should be dependencies here: */
+MODULE_DEPEND(dtraceall, cyclic, 1, 1, 1);
+MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1);
+MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1);
+MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1);
+#if defined(__amd64__) || defined(__i386__)
+MODULE_DEPEND(dtraceall, fbt, 1, 1, 1);
+#endif
+MODULE_DEPEND(dtraceall, sdt, 1, 1, 1);
+MODULE_DEPEND(dtraceall, systrace, 1, 1, 1);
+MODULE_DEPEND(dtraceall, profile, 1, 1, 1);
diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile
new file mode 100644
index 000000000000..104fd9af4454
--- /dev/null
+++ b/sys/modules/dtrace/fasttrap/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/fasttrap
+
+KMOD=		fasttrap
+SRCS=		fasttrap.c
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.if ${MACHINE_ARCH} == "amd64" ||  ${MACHINE_ARCH} == "i386"
+CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel
+.endif
+
+CFLAGS+=	-DSMP -DDEBUG
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/fbt/Makefile b/sys/modules/dtrace/fbt/Makefile
new file mode 100644
index 000000000000..9b69b224a227
--- /dev/null
+++ b/sys/modules/dtrace/fbt/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/fbt
+
+KMOD=		fbt
+SRCS=		fbt.c
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/linsystrace/Makefile b/sys/modules/dtrace/linsystrace/Makefile
new file mode 100644
index 000000000000..fb9deb6eeb4e
--- /dev/null
+++ b/sys/modules/dtrace/linsystrace/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/systrace
+
+KMOD=		linsystrace
+SRCS=		systrace.c
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../../${MACHINE_ARCH}/linux \
+		-I${.CURDIR}/../../..
+
+CFLAGS+=	-DLINUX_SYSTRACE
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/lockstat/Makefile b/sys/modules/dtrace/lockstat/Makefile
new file mode 100644
index 000000000000..d387dab96751
--- /dev/null
+++ b/sys/modules/dtrace/lockstat/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/lockstat
+
+KMOD=		lockstat
+SRCS=		lockstat.c 
+
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/profile/Makefile b/sys/modules/dtrace/profile/Makefile
new file mode 100644
index 000000000000..22cd10d6c9e8
--- /dev/null
+++ b/sys/modules/dtrace/profile/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/profile
+
+KMOD=		profile
+SRCS=		profile.c
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/prototype/Makefile b/sys/modules/dtrace/prototype/Makefile
new file mode 100644
index 000000000000..49cc0a89b273
--- /dev/null
+++ b/sys/modules/dtrace/prototype/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev
+
+KMOD=		prototype
+SRCS=		prototype.c
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/sdt/Makefile b/sys/modules/dtrace/sdt/Makefile
new file mode 100644
index 000000000000..d531d789b803
--- /dev/null
+++ b/sys/modules/dtrace/sdt/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/sdt
+
+KMOD=		sdt
+SRCS=		sdt.c
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/dtrace/systrace/Makefile b/sys/modules/dtrace/systrace/Makefile
new file mode 100644
index 000000000000..d85a365705ee
--- /dev/null
+++ b/sys/modules/dtrace/systrace/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../cddl/dev/systrace
+
+KMOD=		systrace
+SRCS=		systrace.c
+SRCS+=		vnode_if.h
+
+CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
+		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+		-I${.CURDIR}/../../..
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile
new file mode 100644
index 000000000000..5e2195ac8b8f
--- /dev/null
+++ b/sys/modules/opensolaris/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
+
+KMOD=		opensolaris
+SRCS=		opensolaris.c		\
+		opensolaris_cmn_err.c	\
+		opensolaris_kmem.c
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
+.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+SRCS+=		atomic.S
+.else
+SRCS+=		opensolaris_atomic.c
+.endif
+		
+CFLAGS+=	-I${.CURDIR}/../../cddl/compat/opensolaris		\
+		-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common	\
+		-I${.CURDIR}/../..
+
+IGNORE_PRAGMA=	1
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 8ed90e3b5347..0cd4361e4c65 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -4,11 +4,13 @@ KMOD=	zfs
 
 SRCS=	vnode_if.h
 
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/acl
+SUNW=	${.CURDIR}/../../cddl/contrib/opensolaris
+
+.PATH:	${SUNW}/common/acl
 SRCS+=	acl_common.c
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/avl
+.PATH:	${SUNW}/common/avl
 SRCS+=	avl.c
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/nvpair
+.PATH:	${SUNW}/common/nvpair
 SRCS+=	nvpair.c
 
 .PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
@@ -22,28 +24,28 @@ SRCS+=	opensolaris_vfs.c
 SRCS+=	opensolaris_zone.c
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64"
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+.PATH:	${SUNW}/common/atomic/${MACHINE_ARCH}
 SRCS+=	atomic.S
 .else
 .PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_atomic.c
 .endif
 
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs
+.PATH:	${SUNW}/uts/common/fs
 SRCS+=	gfs.c
 
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/os
+.PATH:	${SUNW}/uts/common/os
 SRCS+=	callb.c
 SRCS+=	list.c
 SRCS+=	nvpair_alloc_system.c
 SRCS+=	taskq.c
 
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/rpc
+.PATH:	${SUNW}/uts/common/rpc
 SRCS+=	xdr.c
 SRCS+=	xdr_array.c
 SRCS+=	xdr_mem.c
 
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/zmod
+.PATH:	${SUNW}/uts/common/zmod
 SRCS+=	adler32.c
 SRCS+=	crc32.c
 SRCS+=	deflate.c
@@ -55,9 +57,9 @@ SRCS+=	zmod.c
 SRCS+=	zmod_subr.c
 SRCS+=	zutil.c
 
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/zfs
-.include "${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/Makefile.files"
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs/zfs
+.PATH:	${SUNW}/common/zfs
+.include "${SUNW}/uts/common/Makefile.files"
+.PATH:	${SUNW}/uts/common/fs/zfs
 ZFS_SRCS=	${ZFS_OBJS:C/.o$/.c/}
 SRCS+=	${ZFS_SRCS}
 SRCS+=	vdev_geom.c
@@ -68,28 +70,31 @@ SRCS+=	vdev_geom.c
 # Use FreeBSD's namecache.
 CFLAGS+=-DFREEBSD_NAMECACHE
 
-CWARNFLAGS=-Wall
-CWARNFLAGS+=-Wno-unknown-pragmas
-CWARNFLAGS+=-Wno-missing-braces
-CWARNFLAGS+=-Wno-parentheses
-CWARNFLAGS+=-Wno-uninitialized
-CWARNFLAGS+=-Wno-unused
-CWARNFLAGS+=-Wno-switch
-
-CFLAGS+=-D_SOLARIS_C_SOURCE
-
 CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
-CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/zmod
-CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common
+CFLAGS+=-I${SUNW}/uts/common/fs/zfs
+CFLAGS+=-I${SUNW}/uts/common/zmod
+CFLAGS+=-I${SUNW}/uts/common
 CFLAGS+=-I${.CURDIR}/../..
-CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/common/zfs
-CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/common
+CFLAGS+=-I${SUNW}/common/zfs
+CFLAGS+=-I${SUNW}/common
 CFLAGS+=-I${.CURDIR}/../../../include
-
-WARNS?=1
+CFLAGS+=-DBUILDING_ZFS
 
 #CFLAGS+=-DDEBUG=1
 #DEBUG_FLAGS=-g
 
 .include <bsd.kmod.mk>
+
+CWARNFLAGS+=-Wno-unknown-pragmas
+CWARNFLAGS+=-Wno-missing-prototypes
+CWARNFLAGS+=-Wno-undef
+CWARNFLAGS+=-Wno-strict-prototypes
+CWARNFLAGS+=-Wno-cast-qual
+CWARNFLAGS+=-Wno-parentheses
+CWARNFLAGS+=-Wno-redundant-decls
+CWARNFLAGS+=-Wno-missing-braces
+CWARNFLAGS+=-Wno-uninitialized
+CWARNFLAGS+=-Wno-unused
+CWARNFLAGS+=-Wno-inline
+CWARNFLAGS+=-Wno-switch
+CWARNFLAGS+=-Wno-pointer-arith