diff options
| author | Tejun Heo <tj@kernel.org> | 2024-08-20 08:55:03 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-08-20 08:55:26 -1000 |
| commit | 5ac998574f93ac042cb84b4f1d919e2b20966afe (patch) | |
| tree | 4ee83c519b85793071813b10c2dcbbe63d44ab2e /kernel/sched/idle.c | |
| parent | 89909296a51e792f296e52e104a04aed0cb7a9e9 (diff) | |
| parent | aef6987d89544d63a47753cf3741cabff0b5574c (diff) | |
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 <tj@kernel.org>
Diffstat (limited to 'kernel/sched/idle.c')
| -rw-r--r-- | kernel/sched/idle.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index e53e2da04ba4..06e70d5b5c5f 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -484,13 +484,14 @@ struct task_struct *pick_next_task_idle(struct rq *rq) * It is not legal to sleep in the idle task - print a warning * message if some code attempts to do it: */ -static void +static bool dequeue_task_idle(struct rq *rq, struct task_struct *p, int flags) { raw_spin_rq_unlock_irq(rq); printk(KERN_ERR "bad: scheduling from the idle thread!\n"); dump_stack(); raw_spin_rq_lock_irq(rq); + return true; } /* |