sched/fair: Remove duplicate code from can_migrate_task()
Combine two branches which do the same. Signed-off-by: Kirill Tkhai <ktkhai@parallels.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/20140922183612.11015.64200.stgit@localhost Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
c55f5158f5
commit
7a96c231ca
|
@ -5315,24 +5315,12 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)
|
||||||
if (!tsk_cache_hot)
|
if (!tsk_cache_hot)
|
||||||
tsk_cache_hot = migrate_degrades_locality(p, env);
|
tsk_cache_hot = migrate_degrades_locality(p, env);
|
||||||
|
|
||||||
if (migrate_improves_locality(p, env)) {
|
if (migrate_improves_locality(p, env) || !tsk_cache_hot ||
|
||||||
#ifdef CONFIG_SCHEDSTATS
|
env->sd->nr_balance_failed > env->sd->cache_nice_tries) {
|
||||||
if (tsk_cache_hot) {
|
if (tsk_cache_hot) {
|
||||||
schedstat_inc(env->sd, lb_hot_gained[env->idle]);
|
schedstat_inc(env->sd, lb_hot_gained[env->idle]);
|
||||||
schedstat_inc(p, se.statistics.nr_forced_migrations);
|
schedstat_inc(p, se.statistics.nr_forced_migrations);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!tsk_cache_hot ||
|
|
||||||
env->sd->nr_balance_failed > env->sd->cache_nice_tries) {
|
|
||||||
|
|
||||||
if (tsk_cache_hot) {
|
|
||||||
schedstat_inc(env->sd, lb_hot_gained[env->idle]);
|
|
||||||
schedstat_inc(p, se.statistics.nr_forced_migrations);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue