diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 17:55:12 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 17:55:12 +0800 |
| commit | 777cd605441d129f14db2b970a0684d60ed2b167 (patch) | |
| tree | 7909395a3705609b7c1a31f25dd9b2f9e5d7cffb /crypto/sha3_generic.c | |
| parent | 348f248cd01ef31296b73aaff7fe86ee92b6a825 (diff) | |
| parent | 544545e88de8a0b644b13b740b307a2f10ee0f40 (diff) | |
| download | linux-crypto-777cd605441d129f14db2b970a0684d60ed2b167.tar.gz linux-crypto-777cd605441d129f14db2b970a0684d60ed2b167.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm -
add missing kernel_neon_begin/end pair").
Diffstat (limited to 'crypto/sha3_generic.c')
| -rw-r--r-- | crypto/sha3_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sha3_generic.c b/crypto/sha3_generic.c index 153fe33b..7ed98367 100644 --- a/crypto/sha3_generic.c +++ b/crypto/sha3_generic.c @@ -152,7 +152,7 @@ static SHA3_INLINE void keccakf_round(u64 st[25]) st[24] ^= bc[ 4]; } -static void __optimize("O3") keccakf(u64 st[25]) +static void keccakf(u64 st[25]) { int round; |