diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 14:59:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 14:59:07 -0700 |
| commit | fcbaa19cb691a882b52164d375243638a9f0c7d0 (patch) | |
| tree | d22e795511b00930b9784bd8ca2f6477f24652f8 /crypto/chainiv.c | |
| parent | 6e3b70d7efc613e9444d3931f89c8586880a9181 (diff) | |
| parent | 9b40a3dd3d4e3ff9904e049f6794c972b603272f (diff) | |
| download | linux-crypto-fcbaa19cb691a882b52164d375243638a9f0c7d0.tar.gz linux-crypto-fcbaa19cb691a882b52164d375243638a9f0c7d0.zip | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
Diffstat (limited to 'crypto/chainiv.c')
| -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 834d8dd3..9c294c8f 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 || |