---

yaml --- r: 339338 b: refs/heads/master c: 648bb56 h: refs/heads/master v: v3
git-mirror · Nov 19, 2012 · 071664a · 071664a
1 parent cc0a1d5
commit 071664a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b48c6a80a0f7584056f768268fc12b87745a393f
+refs/heads/master: 648bb56d076bde31113f09a7d24d95bc8d4155ac
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -4317,6 +4317,8 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss)
 
 	printk(KERN_INFO "Initializing cgroup subsys %s\n", ss->name);
 
+	mutex_lock(&cgroup_mutex);
+
 	/* init base cftset */
 	cgroup_init_cftsets(ss);
 
@@ -4346,6 +4348,8 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss)
 	if (ss->post_create)
 		ss->post_create(dummytop);
 
+	mutex_unlock(&cgroup_mutex);
+
 	/* this function shouldn't be used with modular subsystems, since they
 	 * need to register a subsys_id, among other things */
 	BUG_ON(ss->module);