If a task has called freezer_do_not_count(), don't bother waking it
up. If it happens to wake up later it will call freezer_count() and
immediately enter the refrigerator.
Signed-off-by: Colin Cross <ccr...@android.com>
---
kernel/cgroup_freezer.c | 5 ++++-
kernel/power/process.c | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c
index 75dda1e..406dd71 100644
--- a/kernel/cgroup_freezer.c
+++ b/kernel/cgroup_freezer.c
@@ -331,8 +331,11 @@ static void freeze_cgroup(struct freezer *freezer)
struct task_struct *task;
cgroup_iter_start(cgroup, &it);
- while ((task = cgroup_iter_next(cgroup, &it)))
+ while ((task = cgroup_iter_next(cgroup, &it))) {
+ if (freezer_should_skip(task))
+ continue;
freeze_task(task);
+ }
cgroup_iter_end(cgroup, &it);
}
diff --git a/kernel/power/process.c b/kernel/power/process.c
index eb7e6c1..0680be2 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -46,10 +46,10 @@ static int try_to_freeze_tasks(bool user_only)
todo = 0;
read_lock(&tasklist_lock);
do_each_thread(g, p) {
- if (p == current || !freeze_task(p))
+ if (p == current || freezer_should_skip(p))
continue;
- if (!freezer_should_skip(p))
+ if (freeze_task(p))
todo++;
} while_each_thread(g, p);
read_unlock(&tasklist_lock);
--
1.8.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
