diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:51:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 14:51:37 +1000 |
| commit | 4532403b5fb3a5cea96ba31db5309506c203924d (patch) | |
| tree | 53c0234469d74e3043b1af97701e23078a0905e8 /crypto | |
| parent | d61443cb3396ee18856baca4658db54900b9c0b0 (diff) | |
| parent | aec36eaab6009517a7ded2009cdba3508106d4f2 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/arm64/include/asm/thread_info.h
arch/arm64/mm/mmu.c
drivers/block/mtip32xx/mtip32xx.c
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/chainiv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/chainiv.c b/crypto/chainiv.c index 834d8dd3d4f..9c294c8f9a0 100644 --- a/crypto/chainiv.c +++ b/crypto/chainiv.c @@ -126,7 +126,7 @@ static int async_chainiv_schedule_work(struct async_chainiv_ctx *ctx) int err = ctx->err; if (!ctx->queue.qlen) { - smp_mb__before_clear_bit(); + smp_mb__before_atomic(); clear_bit(CHAINIV_STATE_INUSE, &ctx->state); if (!ctx->queue.qlen || |