diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 21:57:07 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 21:57:07 +0800 |
commit | c6dc0609062c6110d04c54e24b81b503eeadb2c8 (patch) | |
tree | c8441197c74e9df8407a00eff2433540924ca5ce /kernel | |
parent | 796b40c6171456274b02447e1dbbea97456403fe (diff) | |
parent | 40c98cb57cdbc377456116ad4582c89e329721b0 (diff) | |
download | linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.gz linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.bz2 linux-c6dc0609062c6110d04c54e24b81b503eeadb2c8.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict between caam changes.
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/padata.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/padata.c b/kernel/padata.c index 05316c9f32da..3202aa17492c 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -186,19 +186,20 @@ static struct padata_priv *padata_get_next(struct parallel_data *pd) reorder = &next_queue->reorder; + spin_lock(&reorder->lock); if (!list_empty(&reorder->list)) { padata = list_entry(reorder->list.next, struct padata_priv, list); - spin_lock(&reorder->lock); list_del_init(&padata->list); atomic_dec(&pd->reorder_objects); - spin_unlock(&reorder->lock); pd->processed++; + spin_unlock(&reorder->lock); goto out; } + spin_unlock(&reorder->lock); if (__this_cpu_read(pd->pqueue->cpu_index) == next_queue->cpu_index) { padata = ERR_PTR(-ENODATA); |