diff options
| author | Tejun Heo <tj@kernel.org> | 2022-08-26 11:13:39 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2022-08-26 11:13:39 -1000 |
| commit | 265efc941fbb5c4478d0466fbb2186bf6d57a9be (patch) | |
| tree | b6e02ec02b16b8a296636e814256c10c639e45eb /include/linux/cgroup.h | |
| parent | fa7e439cf90ba23ea473d0b7d85efd02ae6ccf94 (diff) | |
| parent | 43626dade36fa74d3329046f4ae2d7fdefe401c6 (diff) | |
Merge branch 'for-6.0-fixes' into for-6.1
Pulling to receive 43626dade36f ("group: Add missing cpus_read_lock() to
cgroup_attach_task_all()") for a follow-up patch.
Diffstat (limited to 'include/linux/cgroup.h')
| -rw-r--r-- | include/linux/cgroup.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 30ee8ce2665e..54de466cc74b 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -732,11 +732,6 @@ static inline struct cgroup *cgroup_parent(struct cgroup *cgrp) return NULL; } -static inline struct psi_group *cgroup_psi(struct cgroup *cgrp) -{ - return NULL; -} - static inline bool cgroup_psi_enabled(void) { return false; |