From b4c085bbdb39dd61ed09712cbdef6b518f836a04 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 30 Sep 2024 15:23:32 +0000 Subject: [PATCH] Revert "cgroup: Move rcu_head up near the top of cgroup_root" This reverts commit 0e76e9bb1d8dc9e545ebec593a20c831aab5841d 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: Ib15a38a3826b47d2a058a29c6b042107e70d2e33 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 be8980b02355..064653744976 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -525,10 +525,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; /* Must be near the top */ - /* * The root cgroup. The containing cgroup_root will be destroyed on its * release. cgrp->ancestors[0] will be used overflowing into the @@ -542,6 +538,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;