Revert "cgroup: Move rcu_head up near the top of cgroup_root"
This reverts commit 047f0ee8b5 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 <gregkh@google.com>
This commit is contained in:
parent
ad8d63bdc6
commit
0f76afd374
1 changed files with 4 additions and 4 deletions
|
|
@ -512,10 +512,6 @@ struct cgroup_root {
|
||||||
/* Unique id for this hierarchy. */
|
/* Unique id for this hierarchy. */
|
||||||
int hierarchy_id;
|
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. */
|
/* The root cgroup. Root is destroyed on its release. */
|
||||||
struct cgroup cgrp;
|
struct cgroup cgrp;
|
||||||
|
|
||||||
|
|
@ -525,6 +521,10 @@ struct cgroup_root {
|
||||||
/* Number of cgroups in the hierarchy, used only for /proc/cgroups */
|
/* Number of cgroups in the hierarchy, used only for /proc/cgroups */
|
||||||
atomic_t nr_cgrps;
|
atomic_t nr_cgrps;
|
||||||
|
|
||||||
|
/* A list running through the active hierarchies */
|
||||||
|
struct list_head root_list;
|
||||||
|
struct rcu_head rcu;
|
||||||
|
|
||||||
/* Hierarchy-specific flags */
|
/* Hierarchy-specific flags */
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue