Unverified Commit 0649b214 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4301 v3 kabi: reserve space for cpu cgroup and cpuset cgroup related structures 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiang Yang <xiangyang3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XZEAQVVU2I4ANY7NRJUCAOJ5VQXYFET6/ 
 
https://gitee.com/openeuler/kernel/issues/I8SWPP 
 
Link:https://gitee.com/openeuler/kernel/pulls/4301

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 3fa3a33c 85ff95ab

kernel/cgroup/cpuset.c

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/sched/isolation.h>

#include <linux/cgroup.h>

#include <linux/wait.h>

#include <linux/kabi.h>



DEFINE_STATIC_KEY_FALSE(cpusets_pre_enable_key);

DEFINE_STATIC_KEY_FALSE(cpusets_enabled_key);
@@ -186,6 +187,11 @@ struct cpuset { 


	/* Handle for cpuset.cpus.partition */

	struct cgroup_file partition_file;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

};



/*

kernel/sched/sched.h

+10 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#include <linux/wait_api.h>

#include <linux/wait_bit.h>

#include <linux/workqueue_api.h>

#include <linux/kabi.h>



#include <trace/events/power.h>

#include <trace/events/sched.h>
@@ -455,6 +456,15 @@ struct task_group { 
#if defined(CONFIG_QOS_SCHED_SMART_GRID) && !defined(__GENKSYMS__)

	struct auto_affinity *auto_affinity;

#endif



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)

	KABI_RESERVE(5)

	KABI_RESERVE(6)

	KABI_RESERVE(7)

	KABI_RESERVE(8)

};



#ifdef CONFIG_FAIR_GROUP_SCHED