[tip:sched/core] sched/fair: Cleanup: remove duplicate variable declaration
Commit-ID: 87e3c8ae1c8676b9dd56b56456dafa14a4bacf97
Gitweb: http://git.kernel.org/tip/87e3c8ae1c8676b9dd56b56456dafa14a4bacf97
Author: Kirill Tkhai
AuthorDate: Sun, 21 Jul 2013 04:32:07 +0400
Committer: Ingo Molnar
CommitDate: Mon, 22 Jul 2013 10:27:40 +0200
sched/fair: Cleanup: remove duplicate variable declaration
cfs_rq is declared twice, fix it.
Also use 'se' instead of '>se'.
Signed-off-by: Kirill Tkhai
Cc: Peter Zijlstra
Cc: Steven Rostedt
Link: http://lkml.kernel.org/r/169201374366...@web6d.yandex.ru
Signed-off-by: Ingo Molnar
---
kernel/sched/fair.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
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 @@ 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(>se);
- __synchronize_entity_decay(>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
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[tip:sched/core] sched/fair: Cleanup: remove duplicate variable declaration
Commit-ID: 87e3c8ae1c8676b9dd56b56456dafa14a4bacf97
Gitweb: http://git.kernel.org/tip/87e3c8ae1c8676b9dd56b56456dafa14a4bacf97
Author: Kirill Tkhai tk...@yandex.ru
AuthorDate: Sun, 21 Jul 2013 04:32:07 +0400
Committer: Ingo Molnar mi...@kernel.org
CommitDate: Mon, 22 Jul 2013 10:27:40 +0200
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 tk...@yandex.ru
Cc: Peter Zijlstra pet...@infradead.org
Cc: Steven Rostedt rost...@goodmis.org
Link: http://lkml.kernel.org/r/169201374366...@web6d.yandex.ru
Signed-off-by: Ingo Molnar mi...@kernel.org
---
kernel/sched/fair.c | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
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 @@ 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
}
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
