Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f29940 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched: simplify bonus calculation #1 



current code:

 delta = min(cfs_rq->sleeper_bonus, (u64)delta_exec);
 delta = calc_delta_mine(delta, curr->load.weight, lw);
 delta = min((u64)delta, cfs_rq->sleeper_bonus);

drop the first min(), because we clip against sleeper_bonus in the 3rd line
again. That gives:

 delta = calc_delta_mine(delta_exec, curr->load.weight, lw);
 delta = min((u64)delta, cfs_rq->sleeper_bonus);

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b2133c8b

kernel/sched_fair.c

+1 −2
Original line number Diff line number Diff line
@@ -303,8 +303,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr) 
	delta_mine = calc_delta_mine(delta_exec, curr->load.weight, lw);



	if (cfs_rq->sleeper_bonus > sysctl_sched_granularity) {

		delta = min(cfs_rq->sleeper_bonus, (u64)delta_exec);

		delta = calc_delta_mine(delta, curr->load.weight, lw);

		delta = calc_delta_mine(delta_exec, curr->load.weight, lw);

		delta = min((u64)delta, cfs_rq->sleeper_bonus);

		delta = min(delta, (unsigned long)(

			(long)sysctl_sched_runtime_limit - curr->wait_runtime));