diff options
| author | Colin Cross <ccross@android.com> | 2013-05-06 23:50:18 +0000 | 
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-07-01 15:46:16 -0700 | 
| commit | 5ccf7dfeea5b5e2e63a6d45e85335c788a69e7b2 (patch) | |
| tree | 52296bb123a61128435008831851e7fc65cd21c2 | |
| parent | 947377f9be3f730f91a27d068225ba00db760ccd (diff) | |
| download | olio-linux-3.10-5ccf7dfeea5b5e2e63a6d45e85335c788a69e7b2.tar.xz olio-linux-3.10-5ccf7dfeea5b5e2e63a6d45e85335c788a69e7b2.zip | |
futex: use freezable blocking call
Avoid waking up every thread sleeping in a futex_wait call during
suspend and resume by calling a freezable blocking call.  Previous
patches modified the freezer to avoid sending wakeups to threads
that are blocked in freezable blocking calls.
This call was selected to be converted to a freezable call because
it doesn't hold any locks or release any resources when interrupted
that might be needed by another freezing task or a kernel driver
during suspend, and is a common site where idle userspace tasks are
blocked.
Change-Id: I9ccab9c2d201adb66c85432801cdcf43fc91e94f
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | kernel/futex.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/kernel/futex.c b/kernel/futex.c index b26dcfc02c9..d710fae8abb 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -61,6 +61,7 @@  #include <linux/nsproxy.h>  #include <linux/ptrace.h>  #include <linux/sched/rt.h> +#include <linux/freezer.h>  #include <asm/futex.h> @@ -1807,7 +1808,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,  		 * is no timeout, or if it has yet to expire.  		 */  		if (!timeout || timeout->task) -			schedule(); +			freezable_schedule();  	}  	__set_current_state(TASK_RUNNING);  } |