diff options
| author | Yoshinori Sato <ysato@users.sourceforge.jp> | 2019-06-02 08:46:11 +0200 |
|---|---|---|
| committer | Yoshinori Sato <ysato@users.sourceforge.jp> | 2019-06-02 08:46:11 +0200 |
| commit | 860dbce3d8dd90cb9e909c58fa79808766243651 (patch) | |
| tree | f68920c82fa779ae37bbce08a58259e5c3934ab3 /arch/arm/crypto/sha1_neon_glue.c | |
| parent | Fix allyesconfig output. (diff) | |
| parent | Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | linux-860dbce3d8dd90cb9e909c58fa79808766243651.tar.xz linux-860dbce3d8dd90cb9e909c58fa79808766243651.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'arch/arm/crypto/sha1_neon_glue.c')
| -rw-r--r-- | arch/arm/crypto/sha1_neon_glue.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/crypto/sha1_neon_glue.c b/arch/arm/crypto/sha1_neon_glue.c index d15e0ea2c95e..2c3627334335 100644 --- a/arch/arm/crypto/sha1_neon_glue.c +++ b/arch/arm/crypto/sha1_neon_glue.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Glue code for the SHA1 Secure Hash Algorithm assembler implementation using * ARM NEON instructions. @@ -10,15 +11,10 @@ * Copyright (c) Jean-Francois Dive <jef@linuxbe.org> * Copyright (c) Mathias Krause <minipli@googlemail.com> * Copyright (c) Chandramouli Narayanan <mouli@linux.intel.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * */ #include <crypto/internal/hash.h> +#include <crypto/internal/simd.h> #include <linux/init.h> #include <linux/module.h> #include <linux/mm.h> @@ -39,7 +35,7 @@ static int sha1_neon_update(struct shash_desc *desc, const u8 *data, { struct sha1_state *sctx = shash_desc_ctx(desc); - if (!may_use_simd() || + if (!crypto_simd_usable() || (sctx->count % SHA1_BLOCK_SIZE) + len < SHA1_BLOCK_SIZE) return sha1_update_arm(desc, data, len); @@ -54,7 +50,7 @@ static int sha1_neon_update(struct shash_desc *desc, const u8 *data, static int sha1_neon_finup(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out) { - if (!may_use_simd()) + if (!crypto_simd_usable()) return sha1_finup_arm(desc, data, len, out); kernel_neon_begin(); |