diff options
| author | Kirill Tkhai <tkhai@yandex.ru> | 2013-07-21 02:32:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-22 10:27:40 +0200 |
| commit | 87e3c8ae1c8676b9dd56b56456dafa14a4bacf97 (patch) | |
| tree | 2a48de2db0ffc7f1ae438f915401a53b7b799e9b /kernel/sched/fair.c | |
| parent | Merge tag 'v3.11-rc2' into sched/core (diff) | |
| download | linux-87e3c8ae1c8676b9dd56b56456dafa14a4bacf97.tar.xz linux-87e3c8ae1c8676b9dd56b56456dafa14a4bacf97.zip | |
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>
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index bb456f44b7b1..ab599781129d 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -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 } |