From 411c22f087225c85ff87d26f82e1ce3f5283d074 Mon Sep 17 00:00:00 2001 From: Zhang Hang Date: Wed, 10 Apr 2013 14:04:55 +0800 Subject: [PATCH] --- yaml --- r: 366089 b: refs/heads/master c: 4e2dcb73aecbde9fe4e3137c9ea35cb6aa6cb286 h: refs/heads/master i: 366087: 5b222f429644a344991b7000a64a44a06e0b5cca v: v3 --- [refs] | 2 +- trunk/kernel/sched/fair.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 108153c271b6..4388e29ef1ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28b4a521f618d9722bc780ea38b44718ce0fe283 +refs/heads/master: 4e2dcb73aecbde9fe4e3137c9ea35cb6aa6cb286 diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c index 539760ef00c4..bf8ab4f5e603 100644 --- a/trunk/kernel/sched/fair.c +++ b/trunk/kernel/sched/fair.c @@ -3921,20 +3921,17 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env) tsk_cache_hot = task_hot(p, env->src_rq->clock_task, env->sd); if (!tsk_cache_hot || env->sd->nr_balance_failed > env->sd->cache_nice_tries) { -#ifdef CONFIG_SCHEDSTATS + 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) { - schedstat_inc(p, se.statistics.nr_failed_migrations_hot); - return 0; - } - return 1; + schedstat_inc(p, se.statistics.nr_failed_migrations_hot); + return 0; } /*