diff options
| author | Tejun Heo <tj@kernel.org> | 2026-05-10 22:53:08 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-05-10 22:53:08 -1000 |
| commit | c69e4b02131650c8ae4c467a58987ff7c201889b (patch) | |
| tree | 452d48feda171a7c218ad2e7c5bae05ca0e2f669 /include/linux | |
| parent | 298e7f94fc0350c18801a1cfeb04cd053e78efb5 (diff) | |
| parent | 4a39eda5fdd867fc39f3c039714dd432cee00268 (diff) | |
Merge branch 'for-7.1-fixes' into for-7.2
Pull to receive dde2f938d02f ("cgroup/cpuset: move PF_EXITING check
before __GFP_HARDWALL in cpuset_current_node_allowed()") as a
dependency for an upcoming patch in the same function.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cgroup-defs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index f42563739d2e..50a784da7a81 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -611,8 +611,8 @@ struct cgroup { /* used to wait for offlining of csses */ wait_queue_head_t offline_waitq; - /* used by cgroup_rmdir() to wait for dying tasks to leave */ - wait_queue_head_t dying_populated_waitq; + /* defers killing csses after removal until cgroup is depopulated */ + struct work_struct finish_destroy_work; /* used to schedule release agent */ struct work_struct release_agent_work; |