From: Tejun Heo Date: Tue, 20 Aug 2024 18:55:03 +0000 (-1000) Subject: Merge branch 'tip/sched/core' into for-6.12 X-Git-Tag: v6.12-rc1~111^2~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ac998574f93ac042cb84b4f1d919e2b20966afe;p=thirdparty%2Flinux.git Merge branch 'tip/sched/core' into for-6.12 To receive 863ccdbb918a ("sched: Allow sched_class::dequeue_task() to fail") which makes sched_class.dequeue_task() return bool instead of void. This leads to compile breakage and will be fixed by a follow-up patch. Signed-off-by: Tejun Heo --- 5ac998574f93ac042cb84b4f1d919e2b20966afe diff --cc kernel/sched/sched.h index 9373426d5aaef,2f5d658c0631f..2416b38662566 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@@ -3736,10 -3629,8 +3755,10 @@@ extern int __sched_setaffinity(struct t extern void __setscheduler_prio(struct task_struct *p, int prio); extern void set_load_weight(struct task_struct *p, bool update_load); extern void enqueue_task(struct rq *rq, struct task_struct *p, int flags); - extern void dequeue_task(struct rq *rq, struct task_struct *p, int flags); + extern bool dequeue_task(struct rq *rq, struct task_struct *p, int flags); +extern void check_class_changing(struct rq *rq, struct task_struct *p, + const struct sched_class *prev_class); extern void check_class_changed(struct rq *rq, struct task_struct *p, const struct sched_class *prev_class, int oldprio);