Browse Source

crypto: arm/sha1-ce - enable module autoloading based on CPU feature bits

Make the module autoloadable by tying it to the CPU feature bit that
describes whether the optional instructions it relies on are implemented
by the current CPU.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Ard Biesheuvel 8 years ago
parent
commit
bd56f95ea9
1 changed files with 2 additions and 3 deletions
  1. 2 3
      arch/arm/crypto/sha1-ce-glue.c

+ 2 - 3
arch/arm/crypto/sha1-ce-glue.c

@@ -11,6 +11,7 @@
 #include <crypto/internal/hash.h>
 #include <crypto/internal/hash.h>
 #include <crypto/sha.h>
 #include <crypto/sha.h>
 #include <crypto/sha1_base.h>
 #include <crypto/sha1_base.h>
+#include <linux/cpufeature.h>
 #include <linux/crypto.h>
 #include <linux/crypto.h>
 #include <linux/module.h>
 #include <linux/module.h>
 
 
@@ -82,8 +83,6 @@ static struct shash_alg alg = {
 
 
 static int __init sha1_ce_mod_init(void)
 static int __init sha1_ce_mod_init(void)
 {
 {
-	if (!(elf_hwcap2 & HWCAP2_SHA1))
-		return -ENODEV;
 	return crypto_register_shash(&alg);
 	return crypto_register_shash(&alg);
 }
 }
 
 
@@ -92,5 +91,5 @@ static void __exit sha1_ce_mod_fini(void)
 	crypto_unregister_shash(&alg);
 	crypto_unregister_shash(&alg);
 }
 }
 
 
-module_init(sha1_ce_mod_init);
+module_cpu_feature_match(SHA1, sha1_ce_mod_init);
 module_exit(sha1_ce_mod_fini);
 module_exit(sha1_ce_mod_fini);