Merge branch 'tip/sched/core' into for-6.12
authorTejun Heo <tj@kernel.org>
Tue, 20 Aug 2024 18:55:03 +0000 (08:55 -1000)
committerTejun Heo <tj@kernel.org>
Tue, 20 Aug 2024 18:55:26 +0000 (08:55 -1000)
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 <tj@kernel.org>
1  2 
include/linux/sched.h
kernel/sched/core.c
kernel/sched/debug.c
kernel/sched/fair.c
kernel/sched/idle.c
kernel/sched/sched.h
kernel/sched/syscalls.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 9373426d5aaefdd73ed63bc2f7774482400d40ae,2f5d658c0631fc8cc7993a7e6a35aa8b086e68d7..2416b38662566309ca327a102d4fea39b1e60c5e
@@@ -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);
Simple merge