diff options
author | Steffen Klassert <steffen.klassert@secunet.com> | 2010-04-29 08:40:53 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-02 23:32:11 -0400 |
commit | 7d0d2d385ca7cc511f7d1c64735a1b4aaefd9a1b (patch) | |
tree | f25de7e27e7cf8f0aabf56462c6394ee950d21ee /kernel | |
parent | e2cb2f1c2ccf19914e941859c07558ba5f8a4610 (diff) |
padata: Remove superfluous might_sleep
might_sleep() was placed before mutex_lock() in some places.
We remove them because mutex_lock() does might_sleep() too.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/padata.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel/padata.c b/kernel/padata.c index 1209a17b9718..5fa6ba6f11bd 100644 --- a/kernel/padata.c +++ b/kernel/padata.c | |||
@@ -443,8 +443,6 @@ int padata_set_cpumask(struct padata_instance *pinst, | |||
443 | struct parallel_data *pd; | 443 | struct parallel_data *pd; |
444 | int err = 0; | 444 | int err = 0; |
445 | 445 | ||
446 | might_sleep(); | ||
447 | |||
448 | mutex_lock(&pinst->lock); | 446 | mutex_lock(&pinst->lock); |
449 | 447 | ||
450 | pd = padata_alloc_pd(pinst, cpumask); | 448 | pd = padata_alloc_pd(pinst, cpumask); |
@@ -489,8 +487,6 @@ int padata_add_cpu(struct padata_instance *pinst, int cpu) | |||
489 | { | 487 | { |
490 | int err; | 488 | int err; |
491 | 489 | ||
492 | might_sleep(); | ||
493 | |||
494 | mutex_lock(&pinst->lock); | 490 | mutex_lock(&pinst->lock); |
495 | 491 | ||
496 | cpumask_set_cpu(cpu, pinst->cpumask); | 492 | cpumask_set_cpu(cpu, pinst->cpumask); |
@@ -527,8 +523,6 @@ int padata_remove_cpu(struct padata_instance *pinst, int cpu) | |||
527 | { | 523 | { |
528 | int err; | 524 | int err; |
529 | 525 | ||
530 | might_sleep(); | ||
531 | |||
532 | mutex_lock(&pinst->lock); | 526 | mutex_lock(&pinst->lock); |
533 | 527 | ||
534 | cpumask_clear_cpu(cpu, pinst->cpumask); | 528 | cpumask_clear_cpu(cpu, pinst->cpumask); |
@@ -547,8 +541,6 @@ EXPORT_SYMBOL(padata_remove_cpu); | |||
547 | */ | 541 | */ |
548 | void padata_start(struct padata_instance *pinst) | 542 | void padata_start(struct padata_instance *pinst) |
549 | { | 543 | { |
550 | might_sleep(); | ||
551 | |||
552 | mutex_lock(&pinst->lock); | 544 | mutex_lock(&pinst->lock); |
553 | pinst->flags |= PADATA_INIT; | 545 | pinst->flags |= PADATA_INIT; |
554 | mutex_unlock(&pinst->lock); | 546 | mutex_unlock(&pinst->lock); |
@@ -562,8 +554,6 @@ EXPORT_SYMBOL(padata_start); | |||
562 | */ | 554 | */ |
563 | void padata_stop(struct padata_instance *pinst) | 555 | void padata_stop(struct padata_instance *pinst) |
564 | { | 556 | { |
565 | might_sleep(); | ||
566 | |||
567 | mutex_lock(&pinst->lock); | 557 | mutex_lock(&pinst->lock); |
568 | pinst->flags &= ~PADATA_INIT; | 558 | pinst->flags &= ~PADATA_INIT; |
569 | mutex_unlock(&pinst->lock); | 559 | mutex_unlock(&pinst->lock); |