---

yaml --- r: 164321 b: refs/heads/master c: 3f04e8c h: refs/heads/master i: 164319: ac2d503 v: v3
git-mirror · Sep 19, 2009 · 44d1a6d · 44d1a6d
1 parent fc44594
commit 44d1a6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2e7a7eb2fea109891ffff90f947e8306080a2a3
+refs/heads/master: 3f04e8cd5b24727a2500f8ab8f3de730ba47b02c
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -1339,7 +1339,8 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag
 	int sync = wake_flags & WF_SYNC;
 
 	if (sd_flag & SD_BALANCE_WAKE) {
-		if (sched_feat(AFFINE_WAKEUPS))
+		if (sched_feat(AFFINE_WAKEUPS) &&
+		    cpumask_test_cpu(cpu, &p->cpus_allowed))
 			want_affine = 1;
 		new_cpu = prev_cpu;
 	}