summaryrefslogtreecommitdiffstats
path: root/include/linux/cgroup-defs.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2021-05-24 13:43:56 -0400
committerTejun Heo <tj@kernel.org>2021-05-24 13:43:56 -0400
commitc2a11971549b16a24cce81250d84b63d53499fd0 (patch)
tree7bfa4b1c61ec5ad44834a3e38da3d4958517a00f /include/linux/cgroup-defs.h
parentf4f809f66b7545b89bff4b132cdb37adc2d2c157 (diff)
parent08b2b6fdf6b26032f025084ce2893924a0cdb4a2 (diff)
downloadlinux-stable-c2a11971549b16a24cce81250d84b63d53499fd0.tar.gz
linux-stable-c2a11971549b16a24cce81250d84b63d53499fd0.tar.bz2
linux-stable-c2a11971549b16a24cce81250d84b63d53499fd0.zip
Merge branch 'for-5.13-fixes' into for-5.14
Diffstat (limited to 'include/linux/cgroup-defs.h')
-rw-r--r--include/linux/cgroup-defs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 43fef771009a..1a1f3e8faceb 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -235,7 +235,7 @@ struct css_set {
struct list_head task_iters;
/*
- * On the default hierarhcy, ->subsys[ssid] may point to a css
+ * On the default hierarchy, ->subsys[ssid] may point to a css
* attached to an ancestor instead of the cgroup this css_set is
* associated with. The following node is anchored at
* ->subsys[ssid]->cgroup->e_csets[ssid] and provides a way to
@@ -671,7 +671,7 @@ struct cgroup_subsys {
*/
bool threaded:1;
- /* the following two fields are initialized automtically during boot */
+ /* the following two fields are initialized automatically during boot */
int id;
const char *name;
@@ -760,7 +760,7 @@ static inline void cgroup_threadgroup_change_end(struct task_struct *tsk) {}
* sock_cgroup_data overloads (prioidx, classid) and the cgroup pointer.
* On boot, sock_cgroup_data records the cgroup that the sock was created
* in so that cgroup2 matches can be made; however, once either net_prio or
- * net_cls starts being used, the area is overriden to carry prioidx and/or
+ * net_cls starts being used, the area is overridden to carry prioidx and/or
* classid. The two modes are distinguished by whether the lowest bit is
* set. Clear bit indicates cgroup pointer while set bit prioidx and
* classid.