hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8SA3O -------------------------------- Reserve KABI for future feature development. Signed-off-by: Chen Ridong <chenridong@huawei.com> --- include/linux/cgroup-defs.h | 7 +++++++ include/linux/memcontrol.h | 8 ++++++++ kernel/cgroup/cpuset.c | 5 ----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 8eb518ce87a1..f3fd0407d346 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -325,6 +325,8 @@ struct cgroup_base_stat { #ifdef CONFIG_SCHED_CORE u64 forceidle_sum; #endif + KABI_RESERVE(1) + KABI_RESERVE(2) }; /* @@ -555,6 +557,9 @@ struct cgroup { KABI_RESERVE(3) KABI_RESERVE(4) KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) /* All ancestors including self */ struct cgroup *ancestors[]; }; @@ -606,6 +611,8 @@ struct cgroup_root { KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; /* diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index b2a80e089a0a..abe236201e68 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -429,6 +429,14 @@ struct mem_cgroup { KABI_RESERVE(6) KABI_RESERVE(7) KABI_RESERVE(8) + KABI_RESERVE(9) + KABI_RESERVE(10) + KABI_RESERVE(11) + KABI_RESERVE(12) + KABI_RESERVE(13) + KABI_RESERVE(14) + KABI_RESERVE(15) + KABI_RESERVE(16) struct mem_cgroup_per_node *nodeinfo[]; }; diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index f3cf9b1268e0..7ea0a6d00519 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -211,11 +211,6 @@ struct cpuset { /* Remote partition silbling list anchored at remote_children */ struct list_head remote_sibling; - - KABI_RESERVE(1) - KABI_RESERVE(2) - KABI_RESERVE(3) - KABI_RESERVE(4) }; /* -- 2.34.1