Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[linux-2.6-omap-h63xx.git] / kernel / power / process.c

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 444cea80fde86b5f72a9237b9f83f2af324836b8..ca634019497a5cf8b035872bdaf8edcfaefd8b88 100644 (file)
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -135,6 +135,9 @@ static void thaw_tasks(bool nosig_only)
                if (nosig_only && should_send_signal(p))
                        continue;
 
+               if (cgroup_frozen(p))
+                       continue;
+
                thaw_process(p);
        } while_each_thread(g, p);
        read_unlock(&tasklist_lock);