diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-07 10:11:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-07 10:11:41 -0800 |
| commit | 1fc1cd8399ab5541a488a7e47b2f21537dd76c2d (patch) | |
| tree | 8096fd360f6746e6f7c852a7f070fa1bf6f93266 /include/linux/cgroup-defs.h | |
| parent | Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff) | |
| parent | cpuset: remove unused task_has_mempolicy() (diff) | |
| download | linux-dev-1fc1cd8399ab5541a488a7e47b2f21537dd76c2d.tar.xz linux-dev-1fc1cd8399ab5541a488a7e47b2f21537dd76c2d.zip | |
Merge branch 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup updates from Tejun Heo:
- Oleg's pids controller accounting update which gets rid of rcu delay
in pids accounting updates
- rstat (cgroup hierarchical stat collection mechanism) optimization
- Doc updates
* 'for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: remove unused task_has_mempolicy()
cgroup, rstat: Don't flush subtree root unless necessary
cgroup: add documentation for pids.events file
Documentation: cgroup-v2: eliminate markup warnings
MAINTAINERS: Update cgroup entry
cgroup/pids: turn cgroup_subsys->free() into cgroup_subsys->release() to fix the accounting
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 aad3babef007..1c70803e9f77 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -606,7 +606,7 @@ struct cgroup_subsys { void (*cancel_fork)(struct task_struct *task); void (*fork)(struct task_struct *task); void (*exit)(struct task_struct *task); - void (*free)(struct task_struct *task); + void (*release)(struct task_struct *task); void (*bind)(struct cgroup_subsys_state *root_css); bool early_init:1; |