diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-11 09:14:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-11 09:14:37 -0800 |
| commit | ea1ca66d3cc07b00241fcee82328f387359f32f5 (patch) | |
| tree | eaa2b866471d2268ef93f5e2b4b4365d0e4f0ee3 /include/linux/cgroup-defs.h | |
| parent | 68514dacf2715d11b91ca50d88de047c086fea9c (diff) | |
| parent | d4296faebd337e5f76c0fddb815de33d2b0ad118 (diff) | |
| download | linux-stable-ea1ca66d3cc07b00241fcee82328f387359f32f5.tar.gz linux-stable-ea1ca66d3cc07b00241fcee82328f387359f32f5.tar.bz2 linux-stable-ea1ca66d3cc07b00241fcee82328f387359f32f5.zip | |
Merge branch 'for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
"Nothing too interesting. The only two noticeable changes are a subtle
cpuset behavior fix and trace event id field being expanded to u64
from int. Most others are code cleanups"
* 'for-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: convert 'allowed' in __cpuset_node_allowed() to be boolean
cgroup/rstat: check updated_next only for root
cgroup: rstat: explicitly put loop variant in while
cgroup: return early if it is already on preloaded list
cgroup/cpuset: Don't let child cpusets restrict parent in default hierarchy
cgroup: Trace event cgroup id fields should be u64
cgroup: fix a typo in comment
cgroup: get the wrong css for css_alloc() during cgroup_init_subsys()
cgroup: rstat: Mark benign data race to silence KCSAN
Diffstat (limited to 'include/linux/cgroup-defs.h')
| -rw-r--r-- | include/linux/cgroup-defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 411684c80cf3..1bfcfb1af352 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -413,7 +413,7 @@ struct cgroup { /* * The bitmask of subsystems enabled on the child cgroups. * ->subtree_control is the one configured through - * "cgroup.subtree_control" while ->child_ss_mask is the effective + * "cgroup.subtree_control" while ->subtree_ss_mask is the effective * one which may have more subsystems enabled. Controller knobs * are made available iff it's enabled in ->subtree_control. */ |