Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix for compilation error when using the kernel's CONFIG_LOCKDEP 

Signed-off-by: Tom Caputi <tcaputi@datto.com>
Signed-off-by: Chris Dunlop <chris@onthe.net.au>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #4329
This commit is contained in:
Tom Caputi 2016-07-20 23:29:51 -04:00 committed by Brian Behlendorf
parent 0b04990a5d
commit f4bc1bbe11
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module/icp/include/sys/crypto/impl.h
View File

@ -302,15 +302,9 @@ typedef struct kcf_prov_mech_desc {
#define pm_provider_handle pm_prov_desc.pd_provider_handle #define pm_provider_handle pm_prov_desc.pd_provider_handle
#define pm_ops_vector pm_prov_desc.pd_ops_vector #define pm_ops_vector pm_prov_desc.pd_ops_vector
#define KCF_CPU_PAD (128 - sizeof (crypto_mech_name_t) - \
sizeof (crypto_mech_type_t) - \
sizeof (kmutex_t) - 2 * sizeof (kcf_prov_mech_desc_t *) - \
sizeof (int) - sizeof (uint32_t) - sizeof (size_t))
/* /*
* A mechanism entry in an xxx_mech_tab[]. KCF_CPU_PAD needs * A mechanism entry in an xxx_mech_tab[]. me_pad was deemed
* to be adjusted if this structure is changed. * to be unnecessary and removed.
*/ */
typedef struct kcf_mech_entry { typedef struct kcf_mech_entry {
crypto_mech_name_t me_name; /* mechanism name */ crypto_mech_name_t me_name; /* mechanism name */
@ -332,7 +326,6 @@ typedef struct kcf_mech_entry {
* threshold for using hardware providers for this mech * threshold for using hardware providers for this mech
*/ */
size_t me_threshold; size_t me_threshold;
uint8_t me_pad[KCF_CPU_PAD];
} kcf_mech_entry_t; } kcf_mech_entry_t;
/* /*