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 | |
| parent | cgroup: Homogenize cgroup_get_from_id() return value (diff) | |
| parent | cgroup: Add missing cpus_read_lock() to cgroup_attach_task_all() (diff) | |
| download | linux-dev-265efc941fbb5c4478d0466fbb2186bf6d57a9be.tar.xz linux-dev-265efc941fbb5c4478d0466fbb2186bf6d57a9be.zip | |
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')
| -rw-r--r-- | include/linux/cgroup.h | 5 | ||||
| -rw-r--r-- | include/linux/psi.h | 2 |
2 files changed, 1 insertions, 6 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; diff --git a/include/linux/psi.h b/include/linux/psi.h index 89784763d19e..dd74411ac21d 100644 --- a/include/linux/psi.h +++ b/include/linux/psi.h @@ -27,7 +27,7 @@ void psi_memstall_leave(unsigned long *flags); int psi_show(struct seq_file *s, struct psi_group *group, enum psi_res res); struct psi_trigger *psi_trigger_create(struct psi_group *group, - char *buf, size_t nbytes, enum psi_res res); + char *buf, enum psi_res res); void psi_trigger_destroy(struct psi_trigger *t); __poll_t psi_trigger_poll(void **trigger_ptr, struct file *file, |