diff options
author | Colin Cross <ccross@android.com> | 2013-05-06 19:50:19 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-05-12 08:16:23 -0400 |
commit | b0f8c44f30e58c3aaaaaf864d5c3d3cc2e8a4c2d (patch) | |
tree | 23a6403b011b528059efe7a3c66ad509b34c4091 /kernel/hrtimer.c | |
parent | 56467c7697f5aef6974501fbe2c3e63674583549 (diff) |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index fd4b13b131f8..3ee4d06c6fc2 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <linux/sched/sysctl.h> | 47 | #include <linux/sched/sysctl.h> |
48 | #include <linux/sched/rt.h> | 48 | #include <linux/sched/rt.h> |
49 | #include <linux/timer.h> | 49 | #include <linux/timer.h> |
50 | #include <linux/freezer.h> | ||
50 | 51 | ||
51 | #include <asm/uaccess.h> | 52 | #include <asm/uaccess.h> |
52 | 53 | ||
@@ -1545,7 +1546,7 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod | |||
1545 | t->task = NULL; | 1546 | t->task = NULL; |
1546 | 1547 | ||
1547 | if (likely(t->task)) | 1548 | if (likely(t->task)) |
1548 | schedule(); | 1549 | freezable_schedule(); |
1549 | 1550 | ||
1550 | hrtimer_cancel(&t->timer); | 1551 | hrtimer_cancel(&t->timer); |
1551 | mode = HRTIMER_MODE_ABS; | 1552 | mode = HRTIMER_MODE_ABS; |