summaryrefslogtreecommitdiffstats
path: root/kernel/hrtimer.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-05-06 23:50:19 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-05-12 14:16:23 +0200
commitb0f8c44f30e58c3aaaaaf864d5c3d3cc2e8a4c2d (patch)
tree23a6403b011b528059efe7a3c66ad509b34c4091 /kernel/hrtimer.c
parent56467c7697f5aef6974501fbe2c3e63674583549 (diff)
downloadop-kernel-dev-b0f8c44f30e58c3aaaaaf864d5c3d3cc2e8a4c2d.zip
op-kernel-dev-b0f8c44f30e58c3aaaaaf864d5c3d3cc2e8a4c2d.tar.gz
nanosleep: use freezable blocking call
Avoid waking up every thread sleeping in a nanosleep 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. Acked-by: Tejun Heo <tj@kernel.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Colin Cross <ccross@android.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r--kernel/hrtimer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index fd4b13b..3ee4d06 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -47,6 +47,7 @@
#include <linux/sched/sysctl.h>
#include <linux/sched/rt.h>
#include <linux/timer.h>
+#include <linux/freezer.h>
#include <asm/uaccess.h>
@@ -1545,7 +1546,7 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod
t->task = NULL;
if (likely(t->task))
- schedule();
+ freezable_schedule();
hrtimer_cancel(&t->timer);
mode = HRTIMER_MODE_ABS;
OpenPOWER on IntegriCloud