diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:46:58 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:46:58 +0100 |
| commit | 3284cd638b85916ba6518f913586116412d190c6 (patch) | |
| tree | 61295c7bdc151610a38088e34feb13c8dcaec016 /arch/arm64/crypto/aes-modes.S | |
| parent | 8320832940761e32cb6147a9ffb870eb6ba97065 (diff) | |
| parent | 13150149aa6ded1e6bbe0025beac6e12604dd87c (diff) | |
Merge remote-tracking branch 'arm64/for-next/neon-softirqs-disabled' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/crypto/aes-modes.S')
| -rw-r--r-- | arch/arm64/crypto/aes-modes.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/crypto/aes-modes.S b/arch/arm64/crypto/aes-modes.S index bbdb54702aa7..ab6c14ef9f4e 100644 --- a/arch/arm64/crypto/aes-modes.S +++ b/arch/arm64/crypto/aes-modes.S @@ -700,7 +700,7 @@ AES_FUNC_START(aes_mac_update) cbz w5, .Lmacout encrypt_block v0, w2, x1, x7, w8 st1 {v0.16b}, [x4] /* return dg */ - cond_yield .Lmacout, x7 + cond_yield .Lmacout, x7, x8 b .Lmacloop4x .Lmac1x: add w3, w3, #4 |