diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-12 13:46:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-12 13:46:37 +0200 |
| commit | bbc358e75e4c8a0dff67c3f536778a79a4709598 (patch) | |
| tree | 76a04c80064c55b1cfc10b64e9f21bf2f0ae39c7 /crypto | |
| parent | 6e3b70d7efc613e9444d3931f89c8586880a9181 (diff) | |
| parent | a8c49ed186ffd36d5b38687a9bfb47014edee1c5 (diff) | |
| download | linux-crypto-bbc358e75e4c8a0dff67c3f536778a79a4709598.tar.gz linux-crypto-bbc358e75e4c8a0dff67c3f536778a79a4709598.zip | |
Merge commit '3cf2f34' into sched/core, to fix build error
Fix this dependency on the locking tree's smp_mb*() API changes:
kernel/sched/idle.c:247:3: error: implicit declaration of function ‘smp_mb__after_atomic’ [-Werror=implicit-function-declaration]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 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 || |