From f4bc1bbe11042de49226c69f0334c77af30024b4 Mon Sep 17 00:00:00 2001
From: Tom Caputi <tcaputi@datto.com>
Date: Wed, 20 Jul 2016 23:29:51 -0400
Subject: 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
---
 module/icp/include/sys/crypto/impl.h | 11 ++---------
 1 file 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;
 
 /*
-- 
cgit v1.2.3