Skip to content

Commit

Permalink
Fix for compilation error when using the kernel's CONFIG_LOCKDEP
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Tom Caputi authored and behlendorf committed Jul 22, 2016
1 parent 0b04990 commit f4bc1bb
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions module/icp/include/sys/crypto/impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;

/*
Expand Down

0 comments on commit f4bc1bb

Please sign in to comment.