diff options
| author | Tom Caputi <[email protected]> | 2016-07-20 23:29:51 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-07-21 18:49:50 -0700 |
| commit | f4bc1bbe11042de49226c69f0334c77af30024b4 (patch) | |
| tree | 2549a783d7235646968aa9b6bc44b3ecdb7b8541 | |
| parent | 0b04990a5de594659d2cf20458965277dd6efeb1 (diff) | |
Fix for compilation error when using the kernel's CONFIG_LOCKDEP
Signed-off-by: Tom Caputi <[email protected]>
Signed-off-by: Chris Dunlop <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #4329
| -rw-r--r-- | module/icp/include/sys/crypto/impl.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/module/icp/include/sys/crypto/impl.h b/module/icp/include/sys/crypto/impl.h index 6d8ea8d65..258cb5fed 100644 --- a/module/icp/include/sys/crypto/impl.h +++ b/module/icp/include/sys/crypto/impl.h @@ -302,15 +302,9 @@ typedef struct kcf_prov_mech_desc { #define pm_provider_handle pm_prov_desc.pd_provider_handle #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 - * to be adjusted if this structure is changed. + * A mechanism entry in an xxx_mech_tab[]. me_pad was deemed + * to be unnecessary and removed. */ typedef struct kcf_mech_entry { 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 */ size_t me_threshold; - uint8_t me_pad[KCF_CPU_PAD]; } kcf_mech_entry_t; /* |