summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Klassert <steffen.klassert@secunet.com>2010-04-29 14:40:53 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2010-05-03 05:32:11 +0200
commit7d0d2d385ca7cc511f7d1c64735a1b4aaefd9a1b (patch)
treef25de7e27e7cf8f0aabf56462c6394ee950d21ee
parentpadata: cpu hotplug code should depend on CONFIG_HOTPLUG_CPU (diff)
downloadlinux-7d0d2d385ca7cc511f7d1c64735a1b4aaefd9a1b.tar.xz
linux-7d0d2d385ca7cc511f7d1c64735a1b4aaefd9a1b.zip
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>
-rw-r--r--kernel/padata.c10
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,
struct parallel_data *pd;
int err = 0;
- might_sleep();
-
mutex_lock(&pinst->lock);
pd = padata_alloc_pd(pinst, cpumask);
@@ -489,8 +487,6 @@ int padata_add_cpu(struct padata_instance *pinst, int cpu)
{
int err;
- might_sleep();
-
mutex_lock(&pinst->lock);
cpumask_set_cpu(cpu, pinst->cpumask);
@@ -527,8 +523,6 @@ int padata_remove_cpu(struct padata_instance *pinst, int cpu)
{
int err;
- might_sleep();
-
mutex_lock(&pinst->lock);
cpumask_clear_cpu(cpu, pinst->cpumask);
@@ -547,8 +541,6 @@ EXPORT_SYMBOL(padata_remove_cpu);
*/
void padata_start(struct padata_instance *pinst)
{
- might_sleep();
-
mutex_lock(&pinst->lock);
pinst->flags |= PADATA_INIT;
mutex_unlock(&pinst->lock);
@@ -562,8 +554,6 @@ EXPORT_SYMBOL(padata_start);
*/
void padata_stop(struct padata_instance *pinst)
{
- might_sleep();
-
mutex_lock(&pinst->lock);
pinst->flags &= ~PADATA_INIT;
mutex_unlock(&pinst->lock);