hulk inclusion category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/15498 CVE: NA -------------------------------- Fix kabi breakage in struct sched_entity and sched_class Fixes: f6a953217565 ("sched/eevdf: Use sched_attr::sched_runtime to set request/slice suggestion") Fixes: 5239ee04ed75 ("sched: Allow sched_class::dequeue_task() to fail") Fixes: 442364ee8cbf ("sched/eevdf: Propagate min_slice up the cgroup hierarchy") Signed-off-by: Chen Jinghuang <chenjinghuang2@huawei.com> --- include/linux/sched.h | 7 +++---- kernel/sched/sched.h | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index b23143162c01..6bea3514b5dd 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -582,13 +582,12 @@ struct sched_entity { struct rb_node run_node; u64 deadline; u64 min_vruntime; - u64 min_slice; struct list_head group_node; unsigned int on_rq; KABI_FILL_HOLE(unsigned char rel_deadline) - unsigned char custom_slice; - /* 3 holes left here */ + KABI_FILL_HOLE(unsigned char custom_slice) + /* 2 holes left here */ u64 exec_start; u64 sum_exec_runtime; @@ -630,7 +629,7 @@ struct sched_entity { */ struct sched_avg avg; #endif - KABI_RESERVE(1) + KABI_USE(1, u64 min_slice) KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 4c6858ad64db..d008b102dece 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2450,7 +2450,8 @@ struct sched_class { #endif void (*enqueue_task) (struct rq *rq, struct task_struct *p, int flags); - bool (*dequeue_task)(struct rq *rq, struct task_struct *p, int flags); + KABI_REPLACE(void (*dequeue_task)(struct rq *rq, struct task_struct *p, int flags), + bool (*dequeue_task)(struct rq *rq, struct task_struct *p, int flags)) void (*yield_task) (struct rq *rq); bool (*yield_to_task)(struct rq *rq, struct task_struct *p); -- 2.34.1