diff options
| author | kmacy <kmacy@FreeBSD.org> | 2009-05-09 01:45:55 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2009-05-09 01:45:55 +0000 |
| commit | 0b931b9b69ece82f6c86a30beb2c759054414330 (patch) | |
| tree | 4c2c17426f2c2fad1e87ca530e8a7847c65bf152 /sys/modules | |
| parent | 810e5a84b4607c4d0fc76e9a418ae9fd2b0eeeb2 (diff) | |
| download | FreeBSD-src-0b931b9b69ece82f6c86a30beb2c759054414330.zip FreeBSD-src-0b931b9b69ece82f6c86a30beb2c759054414330.tar.gz | |
- rename atomic.S and crc32.c to avoid collisions when linking zfs in to the kernel
- update Makefile
- ifdef out acl_{alloc, free}, they aren't used by zfs and conflict with existing in-kernel routines
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/zfs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 7ac0237..4f399a8 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -28,7 +28,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 @@ -51,7 +51,7 @@ SRCS+= 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 |
