diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-09-27 00:28:47 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-02 03:41:49 +0200 |
| commit | cfa6a82310de91038a153a2b5d011d5f08573285 (patch) | |
| tree | e4bfddbd855be754b3bb6e9453f8e25d8dcdad38 /src/crypto/zinc/blake2s | |
| parent | ae383dd701c0f27349893d4fbd48c7b72a39b92a (diff) | |
crypto: prefer IS_ENABLED to ifdefs
Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/crypto/zinc/blake2s')
| -rw-r--r-- | src/crypto/zinc/blake2s/blake2s-x86_64-glue.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h index ffbdc1b..b1e86d1 100644 --- a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h +++ b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h @@ -8,16 +8,12 @@ #include <asm/fpu/api.h> #include <asm/simd.h> -#ifdef CONFIG_AS_AVX asmlinkage void blake2s_compress_avx(struct blake2s_state *state, const u8 *block, const size_t nblocks, const u32 inc); -#endif -#ifdef CONFIG_AS_AVX512 asmlinkage void blake2s_compress_avx512(struct blake2s_state *state, const u8 *block, const size_t nblocks, const u32 inc); -#endif static bool blake2s_use_avx __ro_after_init; static bool blake2s_use_avx512 __ro_after_init; @@ -41,21 +37,18 @@ static void __init blake2s_fpu_init(void) static inline bool blake2s_arch(struct blake2s_state *state, const u8 *block, size_t nblocks, const u32 inc) { -#ifdef CONFIG_AS_AVX512 - if (blake2s_use_avx512 && irq_fpu_usable()) { + if (IS_ENABLED(CONFIG_AS_AVX512) && blake2s_use_avx512 && + irq_fpu_usable()) { kernel_fpu_begin(); blake2s_compress_avx512(state, block, nblocks, inc); kernel_fpu_end(); return true; } -#endif -#ifdef CONFIG_AS_AVX - if (blake2s_use_avx && irq_fpu_usable()) { + if (IS_ENABLED(CONFIG_AS_AVX) && blake2s_use_avx && irq_fpu_usable()) { kernel_fpu_begin(); blake2s_compress_avx(state, block, nblocks, inc); kernel_fpu_end(); return true; } -#endif return false; } |