diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-02-21 15:02:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-02-21 15:02:56 +0100 |
| commit | affe678f355738db56361d124757c38c09401341 (patch) | |
| tree | b3583e474859a83c42b0c469c3a20342e0f51423 /include/linux/cgroup-defs.h | |
| parent | 675204778c69c2b3e0f6a4e2dbfeb4f3e89194ba (diff) | |
| parent | 0ad2507d5d93f39619fc42372c347d6006b64319 (diff) | |
Merge tag 'v6.14-rc3' into x86/mm, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/cgroup-defs.h')
| -rw-r--r-- | include/linux/cgroup-defs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 1b20d2d8ef7c..17960a1e858d 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -71,9 +71,6 @@ enum { /* Cgroup is frozen. */ CGRP_FROZEN, - - /* Control group has to be killed. */ - CGRP_KILL, }; /* cgroup_root->flags */ @@ -461,6 +458,9 @@ struct cgroup { int nr_threaded_children; /* # of live threaded child cgroups */ + /* sequence number for cgroup.kill, serialized by css_set_lock. */ + unsigned int kill_seq; + struct kernfs_node *kn; /* cgroup kernfs entry */ struct cgroup_file procs_file; /* handle for "cgroup.procs" */ struct cgroup_file events_file; /* handle for "cgroup.events" */ |