summaryrefslogtreecommitdiffstats
path: root/sys/conf/files.amd64
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2012-03-27 21:23:56 +0000
committerpeter <peter@FreeBSD.org>2012-03-27 21:23:56 +0000
commit0d733393340b7a2fe7ac702939e144d32784779a (patch)
treeae72efb6938071c7385a3cbeb52564369b71c025 /sys/conf/files.amd64
parent97d2a4d873f12791dd1a1606523eae0062ccc7a5 (diff)
downloadFreeBSD-src-0d733393340b7a2fe7ac702939e144d32784779a.zip
FreeBSD-src-0d733393340b7a2fe7ac702939e144d32784779a.tar.gz
Allow (with a license warning) "options ZFS" to work in static kernels.
The 'make depend' rules have to use custom -I paths for the special compat includes for the opensolaris/zfs headers. This option will pull in the couple of files that are shared with dtrace, but they appear to correctly use the MODULE_VERSION/MODULE_DEPEND rules so loader should do the right thing, as should kldload. Reviewed by: pjd (glanced at)
Diffstat (limited to 'sys/conf/files.amd64')
-rw-r--r--sys/conf/files.amd641
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index ce3c307..d243a6d 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -133,6 +133,7 @@ amd64/amd64/uio_machdep.c standard
amd64/amd64/uma_machdep.c standard
amd64/amd64/vm_machdep.c standard
amd64/pci/pci_cfgreg.c optional pci
+cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}"
crypto/aesni/aesencdec_amd64.S optional aesni
crypto/aesni/aeskeys_amd64.S optional aesni
crypto/aesni/aesni.c optional aesni
OpenPOWER on IntegriCloud