anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: fix build breakage in the scheduler out-of-tree code

Browse Source 
In commit 36f416fdda ("sched/fair: Fix cfs_rq_clock_pelt() for
throttled cfs_rq") some internal scheduler fields changed names, so fix
them up in the out-of-tree ANDROID code as well to fix the build.

Fixes: 36f416fdda ("sched/fair: Fix cfs_rq_clock_pelt() for throttled cfs_rq")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibfe5f025af57f6af9602a68d856b2483d293a9b9
This commit is contained in:
Greg Kroah-Hartman
2022-08-06 10:27:45 +02:00
parent ab95bcd8e1
commit 790584e9ab
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/sched/fair.c
View File

@@ -4849,8 +4849,8 @@ static int tg_unthrottle_up(struct task_group *tg, void *data)
cfs_rq->throttle_count--;
if (!cfs_rq->throttle_count) {
cfs_rq->throttled_clock_task_time += rq_clock_task_mult(rq) -
cfs_rq->throttled_clock_task;
cfs_rq->throttled_clock_pelt_time += rq_clock_task_mult(rq) -
cfs_rq->throttled_clock_pelt;
/* Add cfs_rq with load or one or more already running entities to the list */
if (!cfs_rq_is_decayed(cfs_rq) || cfs_rq->nr_running)
@@ -4867,7 +4867,7 @@ static int tg_throttle_down(struct task_group *tg, void *data)
/* group is entering throttled state, stop time */
if (!cfs_rq->throttle_count) {
cfs_rq->throttled_clock_task = rq_clock_task_mult(rq);
cfs_rq->throttled_clock_pelt = rq_clock_task_mult(rq);
list_del_leaf_cfs_rq(cfs_rq);
}
cfs_rq->throttle_count++;
@@ -5311,7 +5311,7 @@ static void sync_throttle(struct task_group *tg, int cpu)
pcfs_rq = tg->parent->cfs_rq[cpu];
cfs_rq->throttle_count = pcfs_rq->throttle_count;
cfs_rq->throttled_clock_task = rq_clock_task_mult(cpu_rq(cpu));
cfs_rq->throttled_clock_pelt = rq_clock_task_mult(cpu_rq(cpu));
}
/* conditionally throttle active cfs_rq's from put_prev_entity() */