From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754648AbaIVScJ (ORCPT ); Mon, 22 Sep 2014 14:32:09 -0400 Received: from forward9l.mail.yandex.net ([84.201.143.142]:45408 "EHLO forward9l.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753524AbaIVScI (ORCPT ); Mon, 22 Sep 2014 14:32:08 -0400 X-Yandex-Uniq: 39c9cc93-87f7-4168-9bad-600f907a26e3 Authentication-Results: smtp11.mail.yandex.net; dkim=pass header.i=@yandex.ru Subject: [PATCH v2 1/6] sched/fair: Remove duplicate code from can_migrate_task() From: Kirill Tkhai To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Ingo Molnar , Kirill Tkhai Date: Mon, 22 Sep 2014 22:32:03 +0400 Message-ID: <20140922183202.10761.6682.stgit@localhost> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kirill Tkhai Combine two branches which do the same. Signed-off-by: Kirill Tkhai --- 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; }