---

yaml --- r: 118023 b: refs/heads/master c: 7ccb974 h: refs/heads/master i: 118021: ba2a7e8 118019: e6b43ab 118015: c3f2c6a v: v3
git-mirror · Oct 30, 2008 · e02d66d · e02d66d
1 parent bdf3c88
commit e02d66d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);