From 3f3d67e9f7bbfaadb1990e8ef115edd411efe5ab Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 21 Nov 2011 12:32:23 -0800 Subject: [PATCH] --- yaml --- r: 280368 b: refs/heads/master c: 6cd8dedcdd8e8de01391a7cf25f0b2afeb24f8f4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/power/process.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 3895268d217f..849b007af29a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a585042f7b933539a0b6bc63650c2d49ffb2e55d +refs/heads/master: 6cd8dedcdd8e8de01391a7cf25f0b2afeb24f8f4 diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c index 23822dc14b6c..9db048fb0d70 100644 --- a/trunk/kernel/power/process.c +++ b/trunk/kernel/power/process.c @@ -170,34 +170,28 @@ int freeze_kernel_threads(void) return error; } -static void thaw_tasks(bool nosig_only) +void thaw_processes(void) { struct task_struct *g, *p; + oom_killer_enable(); + + printk("Restarting tasks ... "); + + thaw_workqueues(); + read_lock(&tasklist_lock); do_each_thread(g, p) { if (!freezable(p)) continue; - if (nosig_only && should_send_signal(p)) - continue; - if (cgroup_freezing_or_frozen(p)) continue; __thaw_task(p); } while_each_thread(g, p); read_unlock(&tasklist_lock); -} - -void thaw_processes(void) -{ - oom_killer_enable(); - printk("Restarting tasks ... "); - thaw_workqueues(); - thaw_tasks(true); - thaw_tasks(false); schedule(); printk("done.\n"); }