Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / crypto / chainiv.c

diff --git a/crypto/chainiv.c b/crypto/chainiv.c
index 834d8dd3d4fc7abf1c72da93cb24f81632989239..9c294c8f9a07888a7d3f5a9210da334c26218f77 100644 (file)
--- 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 ||