summaryrefslogtreecommitdiff
path: root/sys/modules
diff options
context:
space:
mode:
authorKip Macy <kmacy@FreeBSD.org>2009-05-20 23:34:59 +0000
committerKip Macy <kmacy@FreeBSD.org>2009-05-20 23:34:59 +0000
commit5c763151888b2933f081f83fd59df6a6f66d98bd (patch)
treecd7bcde459f4cc3ba54e2d736381827b8078d964 /sys/modules
parent4474790264c671fa6e34a53f8a7af2cc89457f16 (diff)
Notes
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/opensolaris/Makefile3
-rw-r--r--sys/modules/zfs/Makefile15
2 files changed, 11 insertions, 7 deletions
diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile
index a1df2a857ddb..0ee3e3dc6c8d 100644
--- a/sys/modules/opensolaris/Makefile
+++ b/sys/modules/opensolaris/Makefile
@@ -5,11 +5,12 @@
KMOD= opensolaris
SRCS= opensolaris.c \
opensolaris_cmn_err.c \
+ opensolaris_misc.c \
opensolaris_kmem.c
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64"
.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
-SRCS+= atomic.S
+SRCS+= opensolaris_atomic.S
.else
SRCS+= opensolaris_atomic.c
.endif
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 0cd4361e4c65..ae7ce471d26c 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -12,12 +12,14 @@ SRCS+= acl_common.c
SRCS+= avl.c
.PATH: ${SUNW}/common/nvpair
SRCS+= nvpair.c
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/unicode
+SRCS+= u8_textprep.c
.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
SRCS+= opensolaris_kmem.c
SRCS+= opensolaris_kobj.c
SRCS+= opensolaris_kstat.c
-SRCS+= opensolaris_misc.c
+SRCS+= opensolaris_lookup.c
SRCS+= opensolaris_policy.c
SRCS+= opensolaris_string.c
SRCS+= opensolaris_vfs.c
@@ -25,7 +27,7 @@ SRCS+= opensolaris_zone.c
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64"
.PATH: ${SUNW}/common/atomic/${MACHINE_ARCH}
-SRCS+= atomic.S
+SRCS+= opensolaris_atomic.S
.else
.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
SRCS+= opensolaris_atomic.c
@@ -33,6 +35,7 @@ SRCS+= opensolaris_atomic.c
.PATH: ${SUNW}/uts/common/fs
SRCS+= gfs.c
+SRCS+= vnode.c
.PATH: ${SUNW}/uts/common/os
SRCS+= callb.c
@@ -41,13 +44,13 @@ SRCS+= nvpair_alloc_system.c
SRCS+= taskq.c
.PATH: ${SUNW}/uts/common/rpc
-SRCS+= xdr.c
-SRCS+= xdr_array.c
-SRCS+= xdr_mem.c
+SRCS+= opensolaris_xdr.c
+SRCS+= opensolaris_xdr_array.c
+SRCS+= opensolaris_xdr_mem.c
.PATH: ${SUNW}/uts/common/zmod
SRCS+= adler32.c
-SRCS+= crc32.c
+SRCS+= opensolaris_crc32.c
SRCS+= deflate.c
SRCS+= inffast.c
SRCS+= inflate.c