diff options
| author | Mark Brown <broonie@kernel.org> | 2020-10-28 21:36:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-28 21:36:35 +0000 |
| commit | ce038aeaee68f2e41c732b4b91c7185a1cac14b5 (patch) | |
| tree | baa463fe66186edf19b3ca65d002f66dd75f09a1 /lib/crypto | |
| parent | 6d6bc54ab4f2404d46078abc04bf4dee4db01def (diff) | |
| parent | 3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff) | |
Merge tag 'v5.10-rc1' into asoc-5.10
Linux 5.10-rc1
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/chacha20poly1305.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c index 431e04280332..5850f3b87359 100644 --- a/lib/crypto/chacha20poly1305.c +++ b/lib/crypto/chacha20poly1305.c @@ -251,9 +251,7 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src, poly1305_update(&poly1305_state, pad0, 0x10 - (ad_len & 0xf)); } - flags = SG_MITER_TO_SG; - if (!preemptible()) - flags |= SG_MITER_ATOMIC; + flags = SG_MITER_TO_SG | SG_MITER_ATOMIC; sg_miter_start(&miter, src, sg_nents(src), flags); |