[PATCH 3/8] padata: Remove superfluous might_sleep

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Steffen Klassert
Date: Thursday, April 29, 2010 - 5:40 am

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>
---
 kernel/padata.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/kernel/padata.c b/kernel/padata.c
index 1209a17..5fa6ba6 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);
-- 
1.5.6.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/8] padata: fixes/cleanups, Steffen Klassert, (Thu Apr 29, 5:36 am)
[PATCH 3/8] padata: Remove superfluous might_sleep, Steffen Klassert, (Thu Apr 29, 5:40 am)
[PATCH 4/8] padata: Initialize the padata queues only for ..., Steffen Klassert, (Thu Apr 29, 5:41 am)
[PATCH 5/8] padata: Use get_online_cpus/put_online_cpus, Steffen Klassert, (Thu Apr 29, 5:42 am)
[PATCH 6/8] padata: Use a timer to handle the reorder queues, Steffen Klassert, (Thu Apr 29, 5:43 am)
[PATCH 7/8] padata: Flush the padata queues actively, Steffen Klassert, (Thu Apr 29, 5:44 am)
Re: [PATCH 7/8] padata: Flush the padata queues actively, Andrew Morton, (Thu Apr 29, 4:11 pm)