---

yaml --- r: 191394 b: refs/heads/master c: beac4c7 h: refs/heads/master v: v3
git-mirror · Mar 11, 2010 · 6c58263 · 6c58263
1 parent cf86396
commit 6c58263
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13814d42e45dfbe845a0bbe5184565d9236896ae
+refs/heads/master: beac4c7e4a1cc6d57801f690e5e82fa2c9c245c8
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -1434,8 +1434,7 @@ 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) &&
-		    cpumask_test_cpu(cpu, &p->cpus_allowed))
+		if (cpumask_test_cpu(cpu, &p->cpus_allowed))
 			want_affine = 1;
 		new_cpu = prev_cpu;
 	}