Messages in this thread Patch in this message | | | Subject | [PATCH v2 1/6] sched/fair: Remove duplicate code from can_migrate_task() | From | Kirill Tkhai <> | Date | Mon, 22 Sep 2014 22:32:03 +0400 |
| |
From: Kirill Tkhai <ktkhai@parallels.com>
Combine two branches which do the same.
Signed-off-by: Kirill Tkhai <ktkhai@parallels.com> --- kernel/sched/fair.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 2a1e6ac..420bc98 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5292,24 +5292,12 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env) if (!tsk_cache_hot) tsk_cache_hot = migrate_degrades_locality(p, env); - if (migrate_improves_locality(p, env)) { -#ifdef CONFIG_SCHEDSTATS + if (migrate_improves_locality(p, env) || !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); } -#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; }
| |