diff options
-rw-r--r-- | mm/memcontrol.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 604eddc58665..d4f0a831c9e6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -6830,10 +6830,12 @@ static void __init enable_swap_cgroup(void) | |||
6830 | #endif | 6830 | #endif |
6831 | 6831 | ||
6832 | /* | 6832 | /* |
6833 | * The rest of init is performed during ->css_alloc() for root css which | 6833 | * subsys_initcall() for memory controller. |
6834 | * happens before initcalls. hotcpu_notifier() can't be done together as | 6834 | * |
6835 | * it would introduce circular locking by adding cgroup_lock -> cpu hotplug | 6835 | * Some parts like hotcpu_notifier() have to be initialized from this context |
6836 | * dependency. Do it from a subsys_initcall(). | 6836 | * because of lock dependencies (cgroup_lock -> cpu hotplug) but basically |
6837 | * everything that doesn't depend on a specific mem_cgroup structure should | ||
6838 | * be initialized from here. | ||
6837 | */ | 6839 | */ |
6838 | static int __init mem_cgroup_init(void) | 6840 | static int __init mem_cgroup_init(void) |
6839 | { | 6841 | { |