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

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

sched/fair: Rename {en,de}queue_entity_load_avg() 



Since they're now purely about runnable_load, rename them.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b382a531

kernel/sched/fair.c

+6 −6
Original line number Diff line number Diff line
@@ -3549,7 +3549,7 @@ static inline void update_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *s 


/* Add the load generated by se into cfs_rq's load average */

static inline void

enqueue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se)

enqueue_runnable_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se)

{

	cfs_rq->runnable_load_avg += se->avg.load_avg;

	cfs_rq->runnable_load_sum += se_weight(se) * se->avg.load_sum;
@@ -3557,7 +3557,7 @@ enqueue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) 


/* Remove the runnable load generated by se from cfs_rq's runnable load average */

static inline void

dequeue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se)

dequeue_runnable_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se)

{

	sub_positive(&cfs_rq->runnable_load_avg, se->avg.load_avg);

	sub_positive(&cfs_rq->runnable_load_sum, se_weight(se) * se->avg.load_sum);
@@ -3650,9 +3650,9 @@ static inline void update_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *s 
}



static inline void

enqueue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}

enqueue_runnable_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}

static inline void

dequeue_entity_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}

dequeue_runnable_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) {}

static inline void remove_entity_load_avg(struct sched_entity *se) {}



static inline void
@@ -3798,7 +3798,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags) 
	 *   - Add its new weight to cfs_rq->load.weight

	 */

	update_load_avg(cfs_rq, se, UPDATE_TG | DO_ATTACH);

	enqueue_entity_load_avg(cfs_rq, se);

	enqueue_runnable_load_avg(cfs_rq, se);

	update_cfs_shares(se);

	account_entity_enqueue(cfs_rq, se);
@@ -3882,7 +3882,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags) 
	 *     of its group cfs_rq.

	 */

	update_load_avg(cfs_rq, se, UPDATE_TG);

	dequeue_entity_load_avg(cfs_rq, se);

	dequeue_runnable_load_avg(cfs_rq, se);



	update_stats_dequeue(cfs_rq, se, flags);