diff options
| author | Kip Macy <kmacy@FreeBSD.org> | 2009-05-09 01:45:55 +0000 |
|---|---|---|
| committer | Kip Macy <kmacy@FreeBSD.org> | 2009-05-09 01:45:55 +0000 |
| commit | 8569258bf82637b8e913b6c8d59a25d639faa98b (patch) | |
| tree | 4c2c17426f2c2fad1e87ca530e8a7847c65bf152 /sys/cddl/contrib/opensolaris/uts/common/zmod | |
| parent | 7374caaaed222af059fc66cb7fade7074ab391f4 (diff) | |
| download | src-8569258bf82637b8e913b6c8d59a25d639faa98b.tar.gz src-8569258bf82637b8e913b6c8d59a25d639faa98b.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=191931
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/zmod')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c (renamed from sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c b/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c index 61ad581ef562..61ad581ef562 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c +++ b/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c |