diff options
| author | Tejun Heo <tj@kernel.org> | 2014-05-13 11:30:04 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-05-13 11:30:04 -0400 |
| commit | f21a4f7594a122dcaabc08ce03bfb63fdc34de1b (patch) | |
| tree | bdce189dc55f875e5466c31374c52b48f4ba4db0 /kernel/cgroup.c | |
| parent | d39ea871c3c1269e2852ea096fff492ea034df8a (diff) | |
| parent | 36e9d2ebcc15d029b33f42a36146ab5a5bcfcfe7 (diff) | |
| download | blackbird-op-linux-f21a4f7594a122dcaabc08ce03bfb63fdc34de1b.tar.gz blackbird-op-linux-f21a4f7594a122dcaabc08ce03bfb63fdc34de1b.zip | |
Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup into for-3.16
Pull to receive e37a06f10994 ("cgroup: fix the retry path of
cgroup_mount()") to avoid unnecessary conflicts with planned
cgroup_tree_mutex removal and also to be able to remove the temp fix
added by 36c38fb7144a ("blkcg: use trylock on blkcg_pol_mutex in
blkcg_reset_stats()") afterwards.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 07815ef7b1f6..9db1a9629a5c 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -439,7 +439,7 @@ struct cgrp_cset_link { * reference-counted, to improve performance when child cgroups * haven't been created. */ -static struct css_set init_css_set = { +struct css_set init_css_set = { .refcount = ATOMIC_INIT(1), .cgrp_links = LIST_HEAD_INIT(init_css_set.cgrp_links), .tasks = LIST_HEAD_INIT(init_css_set.tasks), |
