summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorZefan Li <lizefan@huawei.com>2015-03-04 17:09:33 +0800
committerTejun Heo <tj@kernel.org>2015-03-05 08:05:20 -0500
commit695df2132cfe3782784d4b0e1f0027168c1830ca (patch)
treeee04229ec0f33993fe7ca84b336587ba2274da07 /init
parent587945147cfe48c84dd92c022e25aad6d92c0da8 (diff)
downloadkernel-695df2132cfe3782784d4b0e1f0027168c1830ca.tar.gz
cpuset: initialize cpuset a bit early
Now we call ss->bind() in cgroup_init(), so cgroup_init() will call cpuset_bind() and then the latter will access top_cpuset's cpumask, which is NULL, because cpuset_init() is called after cgroup_init() The simplest fix is to swap cgroup_init() and cpuset_init(). Cc: Vladimir Davydov <vdavydov@parallels.com> Fixes: 295458e67284 ("cgroup: call cgroup_subsys->bind on cgroup subsys initialization") Reported by: Ming Lei <tom.leiming@gmail.com> Signed-off-by: Zefan Li <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Vladimir Davydov <vdavydov@parallels.com>
Diffstat (limited to 'init')
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index 6f0f1c5ff8cc..4a6974e67839 100644
--- a/init/main.c
+++ b/init/main.c
@@ -654,8 +654,8 @@ asmlinkage __visible void __init start_kernel(void)
page_writeback_init();
proc_root_init();
nsfs_init();
- cgroup_init();
cpuset_init();
+ cgroup_init();
taskstats_init_early();
delayacct_init();