From 0f76afd37494fbfd9850bea079293e7ad9de96bf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 15 Dec 2024 09:48:32 +0000 Subject: [PATCH] Revert "cgroup: Move rcu_head up near the top of cgroup_root" This reverts commit 047f0ee8b572bfd7a23aee4415035fc50faf56ed which is commit a7fb0423c201ba12815877a0b5a68a6a1710b23a upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I33ffbca6cd6d6d28cf37ca0256fcb75b1955a90c Signed-off-by: Greg Kroah-Hartman --- include/linux/cgroup-defs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 6bd167ee57de..d65607f99ee9 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -512,10 +512,6 @@ struct cgroup_root { /* Unique id for this hierarchy. */ int hierarchy_id; - /* A list running through the active hierarchies */ - struct list_head root_list; - struct rcu_head rcu; - /* The root cgroup. Root is destroyed on its release. */ struct cgroup cgrp; @@ -525,6 +521,10 @@ struct cgroup_root { /* Number of cgroups in the hierarchy, used only for /proc/cgroups */ atomic_t nr_cgrps; + /* A list running through the active hierarchies */ + struct list_head root_list; + struct rcu_head rcu; + /* Hierarchy-specific flags */ unsigned int flags;