commit 87e3c8ae1c8676b9dd56b56456dafa14a4bacf97
author Kirill Tkhai <tkhai@yandex.ru> Sun Jul 21 04:32:07 2013 +0400
committer Ingo Molnar <mingo@kernel.org> Mon Jul 22 10:27:40 2013 +0200
tree 2a48de2db0ffc7f1ae438f915401a53b7b799e9b
parent b24d6f49122d9da8202d751ac7e66fe8136bb434

sched/fair: Cleanup: remove duplicate variable declaration

cfs_rq is declared twice, fix it.

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

Signed-off-by: Kirill 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: Ingo Molnar <mingo@kernel.org>

kernel/sched/fair.c

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index bb456f4..ab59978 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5889,11 +5889,9 @@
 	* 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
 }