diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-07-18 11:36:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-07-18 11:36:53 +0200 |
| commit | 1ed7d32763857fbdc8e406352404538e41050d22 (patch) | |
| tree | f97c5d8f548141bf7cdec0a9d7f22adb61da6efc /arch/arm/crypto/aes-ce-glue.c | |
| parent | 660da7c9228f685b2ebe664f9fd69aaddcc420b5 (diff) | |
| parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
| download | talos-obmc-linux-1ed7d32763857fbdc8e406352404538e41050d22.tar.gz talos-obmc-linux-1ed7d32763857fbdc8e406352404538e41050d22.zip | |
Merge branch 'x86/boot' into x86/mm, to pick up interacting changes
The SME patches we are about to apply add some E820 logic, so merge in
pending E820 code changes first, to have a single code base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/crypto/aes-ce-glue.c')
| -rw-r--r-- | arch/arm/crypto/aes-ce-glue.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c index 883b84d828c5..0f966a8ca1ce 100644 --- a/arch/arm/crypto/aes-ce-glue.c +++ b/arch/arm/crypto/aes-ce-glue.c @@ -14,6 +14,7 @@ #include <crypto/aes.h> #include <crypto/internal/simd.h> #include <crypto/internal/skcipher.h> +#include <linux/cpufeature.h> #include <linux/module.h> #include <crypto/xts.h> @@ -425,9 +426,6 @@ static int __init aes_init(void) int err; int i; - if (!(elf_hwcap2 & HWCAP2_AES)) - return -ENODEV; - err = crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs)); if (err) return err; @@ -451,5 +449,5 @@ unregister_simds: return err; } -module_init(aes_init); +module_cpu_feature_match(AES, aes_init); module_exit(aes_exit); |
