From d57a9513a8aa9b8d3489a181865643feeaef1573 Mon Sep 17 00:00:00 2001
From: Matt Helsley <matthltc@us.ibm.com>
Date: Sat, 18 Oct 2008 20:27:22 -0700
Subject: [PATCH] --- yaml --- r: 115882 b: refs/heads/master c:
 5a06915c6df9b89cda5ddb3f8cce5f9a6be534d2 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/power/process.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d6f5e24a50b4..e0c1b641e5e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc52ddc0e6f45b04780b26fc0813509f8e798c42
+refs/heads/master: 5a06915c6df9b89cda5ddb3f8cce5f9a6be534d2
diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c
index 444cea80fde8..ca634019497a 100644
--- a/trunk/kernel/power/process.c
+++ b/trunk/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);