---

yaml --- r: 356610 b: refs/heads/master c: 1081312 h: refs/heads/master v: v3
git-mirror · Feb 24, 2013 · 47d82ff · 47d82ff
1 parent 3641825
commit 47d82ff
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e477749624fcf0dc95bfa494b7fa6ba2000fe670
+refs/heads/master: 1081312f95be1a0fc093556d789e482d3ab0f5b0
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -6830,10 +6830,12 @@ static void __init enable_swap_cgroup(void)
 #endif
 
 /*
- * The rest of init is performed during ->css_alloc() for root css which
- * happens before initcalls.  hotcpu_notifier() can't be done together as
- * it would introduce circular locking by adding cgroup_lock -> cpu hotplug
- * dependency.  Do it from a subsys_initcall().
+ * subsys_initcall() for memory controller.
+ *
+ * Some parts like hotcpu_notifier() have to be initialized from this context
+ * because of lock dependencies (cgroup_lock -> cpu hotplug) but basically
+ * everything that doesn't depend on a specific mem_cgroup structure should
+ * be initialized from here.
  */
 static int __init mem_cgroup_init(void)
 {