git: 09cd63416051 - main - zfs: fix commit dae1713419a6 merge openzfs/zfs@269b5dadc into main
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 17 Nov 2021 12:23:12 UTC
The branch main has been updated by se:
URL: https://cgit.FreeBSD.org/src/commit/?id=09cd63416051ec8007ebc5ec45af44314eb5a0e8
commit 09cd63416051ec8007ebc5ec45af44314eb5a0e8
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2021-11-17 12:16:39 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2021-11-17 12:16:39 +0000
zfs: fix commit dae1713419a6 merge openzfs/zfs@269b5dadc into main
Commit dae1713419a6 did not add two required lines for edonr specific
functionality to this file, causing kernel build failures if ZFS is
compiled in.
This commit should be included in an eventual MFC of dae1713419a6.
---
sys/conf/files | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys/conf/files b/sys/conf/files
index 4cc6e3dcde8c..aceaac1bd95e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -243,6 +243,9 @@ contrib/openzfs/module/zcommon/zfs_prop.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zcommon/zpool_prop.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zcommon/zprop_common.c optional zfs compile-with "${ZFS_C}"
+# zfs edon-r hash support
+contrib/openzfs/module/icp/algs/edonr/edonr.c optional zfs compile-with "${ZFS_C}"
+
#zfs core common code
contrib/openzfs/module/zfs/abd.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/aggsum.c optional zfs compile-with "${ZFS_C}"
@@ -283,6 +286,7 @@ contrib/openzfs/module/zfs/dsl_prop.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/dsl_scan.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/dsl_synctask.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/dsl_userhold.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/zfs/edonr_zfs.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/fm.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/gzip.c optional zfs compile-with "${ZFS_C}"
contrib/openzfs/module/zfs/lzjb.c optional zfs compile-with "${ZFS_C}"