From e02d66d1e4f332594196112a3cd0fa6f4be50330 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Wed, 29 Oct 2008 14:00:51 -0700
Subject: [PATCH] --- yaml --- r: 118023 b: refs/heads/master c:
 7ccb97437bcc818d0ba6067513475f6ee8177a15 h: refs/heads/master i:   118021:
 ba2a7e8493bae0d9e787488a98c924f97053b3e4   118019:
 e6b43abd94d5a450c87561f160850bbef2023211   118015:
 c3f2c6a91235f43cc864c047f661b10db136737e v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/cgroup_freezer.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3866c7aa8f9e..1e698587f916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df8bc08c192f00f155185bfd6f052d46a728814a
+refs/heads/master: 7ccb97437bcc818d0ba6067513475f6ee8177a15
diff --git a/trunk/kernel/cgroup_freezer.c b/trunk/kernel/cgroup_freezer.c
index e95056954498..7f54d1c42953 100644
--- a/trunk/kernel/cgroup_freezer.c
+++ b/trunk/kernel/cgroup_freezer.c
@@ -190,8 +190,9 @@ static void freezer_fork(struct cgroup_subsys *ss, struct task_struct *task)
 	freezer = task_freezer(task);
 	task_unlock(task);
 
-	BUG_ON(freezer->state == CGROUP_FROZEN);
 	spin_lock_irq(&freezer->lock);
+	BUG_ON(freezer->state == CGROUP_FROZEN);
+
 	/* Locking avoids race with FREEZING -> THAWED transitions. */
 	if (freezer->state == CGROUP_FREEZING)
 		freeze_task(task, true);