1 files changed, 11 insertions, 4 deletions

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 9f6f5c755cfa..0beb51e1dec9 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -101,7 +101,7 @@ static int try_to_freeze_tasks(bool sig_only)
                 read_lock(&tasklist_lock);
                 do_each_thread(g, p) {
                         if (!wakeup && !freezer_should_skip(p) &&
-                            freezing(p) && !frozen(p))
+                            p != current && freezing(p) && !frozen(p))
                                 sched_show_task(p);
                 } while_each_thread(g, p);
                 read_unlock(&tasklist_lock);
@@ -122,7 +122,11 @@ int freeze_processes(void)
 {
         int error;
 
+        if (!pm_freezing)
+                atomic_inc(&system_freezing_cnt);
+
         printk("Freezing user space processes ... ");
+        pm_freezing = true;
         error = try_to_freeze_tasks(true);
         if (!error) {
                 printk("done.");
@@ -146,6 +150,7 @@ int freeze_kernel_threads(void)
         int error;
 
         printk("Freezing remaining freezable tasks ... ");
+        pm_nosig_freezing = true;
         error = try_to_freeze_tasks(false);
         if (!error)
                 printk("done.");
@@ -162,6 +167,11 @@ void thaw_processes(void)
 {
         struct task_struct *g, *p;
 
+        if (pm_freezing)
+                atomic_dec(&system_freezing_cnt);
+        pm_freezing = false;
+        pm_nosig_freezing = false;
+
         oom_killer_enable();
 
         printk("Restarting tasks ... ");
@@ -170,9 +180,6 @@ void thaw_processes(void)
 
         read_lock(&tasklist_lock);
         do_each_thread(g, p) {
-                if (cgroup_freezing(p))
-                        continue;
-
                 __thaw_task(p);
         } while_each_thread(g, p);
         read_unlock(&tasklist_lock);