diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 14:39:37 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-06-28 14:39:37 +1000 |
| commit | 6e142a47b611b6916f1dc89d65b39b60e478e950 (patch) | |
| tree | 69fc3ced93b4eeaec8161cfde0cbfdc6bc49434a /include | |
| parent | 5981d2776f958eb6dab5aa16af4c7bcf4218ae61 (diff) | |
| parent | 27924b13fcce42222e836394711fe1e7ec010cc6 (diff) | |
| download | linux-next-6e142a47b611b6916f1dc89d65b39b60e478e950.tar.gz linux-next-6e142a47b611b6916f1dc89d65b39b60e478e950.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup-defs.h | 5 | ||||
| -rw-r--r-- | include/linux/cgroup.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 1bfcfb1af352..ce60c7cc2dfc 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -264,7 +264,8 @@ struct css_set { * List of csets participating in the on-going migration either as * source or destination. Protected by cgroup_mutex. */ - struct list_head mg_preload_node; + struct list_head mg_src_preload_node; + struct list_head mg_dst_preload_node; struct list_head mg_node; /* @@ -475,7 +476,7 @@ struct cgroup { struct work_struct release_agent_work; /* used to track pressure stalls */ - struct psi_group psi; + struct psi_group *psi; /* used to store eBPF programs */ struct cgroup_bpf bpf; diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 0d1ada8968d7..ed53bfe7c46c 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -674,7 +674,7 @@ static inline void pr_cont_cgroup_path(struct cgroup *cgrp) static inline struct psi_group *cgroup_psi(struct cgroup *cgrp) { - return &cgrp->psi; + return cgrp->psi; } bool cgroup_psi_enabled(void); |