---

yaml --- r: 366089 b: refs/heads/master c: 4e2dcb7 h: refs/heads/master i: 366087: 5b222f4 v: v3
git-mirror · Apr 10, 2013 · 411c22f · 411c22f
1 parent 0a9289f
commit 411c22f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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;
 }
 
 /*