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

Commit 87e3c8ae authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Ingo Molnar
Browse files

sched/fair: Cleanup: remove duplicate variable declaration 



cfs_rq is declared twice, fix it.

Also use 'se' instead of '&p->se'.

Signed-off-by: default avatarKirill Tkhai <tkhai@yandex.ru>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/169201374366727@web6d.yandex.ru


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b24d6f49

kernel/sched/fair.c

+3 −5
Original line number Diff line number Diff line
@@ -5889,11 +5889,9 @@ static void switched_from_fair(struct rq *rq, struct task_struct *p) 
	* and ensure we don't carry in an old decay_count if we

	* switch back.

	*/

	if (p->se.avg.decay_count) {

		struct cfs_rq *cfs_rq = cfs_rq_of(&p->se);

		__synchronize_entity_decay(&p->se);

		subtract_blocked_load_contrib(cfs_rq,

				p->se.avg.load_avg_contrib);

	if (se->avg.decay_count) {

		__synchronize_entity_decay(se);

		subtract_blocked_load_contrib(cfs_rq, se->avg.load_avg_contrib);

	}

#endif

}