tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "sched/fair: Fixup wake_up_sync() vs DELAYED_DEQUEUE"

Browse Source 
This reverts commit a2562bdd35 which is
commit aa3ee4f0b7541382c9f6f43f7408d73a5d4f4042 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I4f679ae99a3ad252f2ff1965c02b26799254911d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-07-13 12:28:15 +00:00
parent 50d296188b
commit 797d4c3533
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/sched/fair.c
+2 -11
View File
@@ -7421,11 +7421,6 @@ static bool dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)
return true; return true;
} }
static inline unsigned int cfs_h_nr_delayed(struct rq *rq)
{
return (rq->cfs.h_nr_queued - rq->cfs.h_nr_runnable);
}
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
/* Working cpumask for: sched_balance_rq(), sched_balance_newidle(). */ /* Working cpumask for: sched_balance_rq(), sched_balance_newidle(). */
@@ -7587,12 +7582,8 @@ wake_affine_idle(int this_cpu, int prev_cpu, int sync)
if (available_idle_cpu(this_cpu) && cpus_share_cache(this_cpu, prev_cpu)) if (available_idle_cpu(this_cpu) && cpus_share_cache(this_cpu, prev_cpu))
return available_idle_cpu(prev_cpu) ? prev_cpu : this_cpu; return available_idle_cpu(prev_cpu) ? prev_cpu : this_cpu;
if (sync) { if (sync && cpu_rq(this_cpu)->nr_running == 1)
struct rq *rq = cpu_rq(this_cpu); return this_cpu;
if ((rq->nr_running - cfs_h_nr_delayed(rq)) == 1)
return this_cpu;
}
if (available_idle_cpu(prev_cpu)) if (available_idle_cpu(prev_cpu))
return prev_cpu; return prev_cpu;