crypto: arm/ghash-ce - enable module autoloading based on CPU feature bits (c9d9f608) · Commits · 戴 / test

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>

arch/arm/crypto/ghash-ce-glue.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <crypto/cryptd.h>
		#include <crypto/internal/hash.h>
		#include <crypto/gf128mul.h>
		#include <linux/cpufeature.h>
		#include <linux/crypto.h>
		#include <linux/module.h>

		@@ -311,9 +312,6 @@ static int __init ghash_ce_mod_init(void)
		{
		int err;

		if (!(elf_hwcap2 & HWCAP2_PMULL))
		return -ENODEV;

		err = crypto_register_shash(&ghash_alg);
		if (err)
		return err;
		@@ -334,5 +332,5 @@ static void __exit ghash_ce_mod_exit(void)
		crypto_unregister_shash(&ghash_alg);
		}

		module_init(ghash_ce_mod_init);
		module_cpu_feature_match(PMULL, ghash_ce_mod_init);
		module_exit(ghash_ce_mod_exit);

Admin message