---

yaml --- r: 130779 b: refs/heads/master c: 1596e29 h: refs/heads/master i: 130777: 41e24d0 130775: 73861f2 v: v3
git-mirror · Feb 1, 2009 · 5bc36fe · 5bc36fe
1 parent a039c2d
commit 5bc36fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d942fb6c7d391baba3dddb566eb735fbf3df8528
+refs/heads/master: 1596e29773eadd96b0a5fc6e736afa52394cafda
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -2266,9 +2266,15 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
 	if (!sched_feat(SYNC_WAKEUPS))
 		sync = 0;
 
-	if (!sync && (current->se.avg_overlap < sysctl_sched_migration_cost &&
-			    p->se.avg_overlap < sysctl_sched_migration_cost))
-		sync = 1;
+	if (!sync) {
+		if (current->se.avg_overlap < sysctl_sched_migration_cost &&
+			  p->se.avg_overlap < sysctl_sched_migration_cost)
+			sync = 1;
+	} else {
+		if (current->se.avg_overlap >= sysctl_sched_migration_cost ||
+			  p->se.avg_overlap >= sysctl_sched_migration_cost)
+			sync = 0;
+	}
 
 #ifdef CONFIG_SMP
 	if (sched_feat(LB_WAKEUP_UPDATE)) {