LU-2212 crypto: add crc32c module loading to libcfs

[fs/lustre-release.git] / libcfs / libcfs / linux / linux-crypto.c

diff --git a/libcfs/libcfs/linux/linux-crypto.c b/libcfs/libcfs/linux/linux-crypto.c
index f9d0c4e..2f14540 100644 (file)
--- a/libcfs/libcfs/linux/linux-crypto.c
+++ b/libcfs/libcfs/linux/linux-crypto.c
@@ -344,20 +344,22 @@ static int cfs_crypto_test_hashes(void)
 
 static int crc32, adler32;
 
-#ifdef CONFIG_X86
+#ifdef HAVE_PCLMULQDQ
 static int crc32pclmul;
 #endif
 
 int cfs_crypto_register(void)
 {
+       cfs_request_module("crc32c");
+
        crc32 = cfs_crypto_crc32_register();
        adler32 = cfs_crypto_adler32_register();
 
-#ifdef CONFIG_X86
+#ifdef HAVE_PCLMULQDQ
        crc32pclmul = cfs_crypto_crc32_pclmul_register();
 #endif
 
-       /* check all algorithms and do perfermance test */
+       /* check all algorithms and do performance test */
        cfs_crypto_test_hashes();
        return 0;
 }
@@ -368,7 +370,7 @@ void cfs_crypto_unregister(void)
        if (adler32 == 0)
                cfs_crypto_adler32_unregister();
 
-#ifdef CONFIG_X86
+#ifdef HAVE_PCLMULQDQ
        if (crc32pclmul == 0)
                cfs_crypto_crc32_pclmul_unregister();
 #endif