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 | 9cb3ef8ef1618654212b3b6fdd65f5889ce65336 (patch) | |
| tree | c65b80f5c0a53be30237630861b652360bd710d2 /src/crypto/zinc/curve25519/curve25519-arm-glue.h | |
| parent | crypto: ignore ARMv3 (diff) | |
| download | wireguard-monolithic-historical-9cb3ef8ef1618654212b3b6fdd65f5889ce65336.tar.xz wireguard-monolithic-historical-9cb3ef8ef1618654212b3b6fdd65f5889ce65336.zip | |
crypto: prefer IS_ENABLED to ifdefs
Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'src/crypto/zinc/curve25519/curve25519-arm-glue.h')
| -rw-r--r-- | src/crypto/zinc/curve25519/curve25519-arm-glue.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/crypto/zinc/curve25519/curve25519-arm-glue.h b/src/crypto/zinc/curve25519/curve25519-arm-glue.h index 7969fec..1e6769c 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-arm-glue.h @@ -7,11 +7,9 @@ #include <asm/neon.h> #include <asm/simd.h> -#if defined(CONFIG_KERNEL_MODE_NEON) && !defined(CONFIG_CPU_BIG_ENDIAN) asmlinkage void curve25519_neon(u8 mypublic[CURVE25519_KEY_SIZE], const u8 secret[CURVE25519_KEY_SIZE], const u8 basepoint[CURVE25519_KEY_SIZE]); -#endif static bool curve25519_use_neon __ro_after_init; @@ -24,14 +22,14 @@ static inline bool curve25519_arch(u8 mypublic[CURVE25519_KEY_SIZE], const u8 secret[CURVE25519_KEY_SIZE], const u8 basepoint[CURVE25519_KEY_SIZE]) { -#if defined(CONFIG_KERNEL_MODE_NEON) && !defined(CONFIG_CPU_BIG_ENDIAN) - if (curve25519_use_neon && may_use_simd()) { + if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && + !IS_ENABLED(CONFIG_CPU_BIG_ENDIAN) && curve25519_use_neon && + may_use_simd()) { kernel_neon_begin(); curve25519_neon(mypublic, secret, basepoint); kernel_neon_end(); return true; } -#endif return false; } |