Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / arch / arm64 / crypto / sha256-glue.c

diff --git a/arch/arm64/crypto/sha256-glue.c b/arch/arm64/crypto/sha256-glue.c
index 54586e0..e622987 100644 (file)
--- a/arch/arm64/crypto/sha256-glue.c
+++ b/arch/arm64/crypto/sha256-glue.c
@@ -174,7 +174,7 @@ static int __init sha256_mod_init(void)
        if (ret)
                return ret;
 
-       if (elf_hwcap & HWCAP_ASIMD) {
+       if (cpu_have_named_feature(ASIMD)) {
                ret = crypto_register_shashes(neon_algs, ARRAY_SIZE(neon_algs));
                if (ret)
                        crypto_unregister_shashes(algs, ARRAY_SIZE(algs));
@@ -184,7 +184,7 @@ static int __init sha256_mod_init(void)
 
 static void __exit sha256_mod_fini(void)
 {
-       if (elf_hwcap & HWCAP_ASIMD)
+       if (cpu_have_named_feature(ASIMD))
                crypto_unregister_shashes(neon_algs, ARRAY_SIZE(neon_algs));
        crypto_unregister_shashes(algs, ARRAY_SIZE(algs));
 }