From 6c58263ad70ff0a31b4d1ae60b6112ee9f51dbbc Mon Sep 17 00:00:00 2001 From: Mike Galbraith Date: Thu, 11 Mar 2010 17:17:20 +0100 Subject: [PATCH] --- yaml --- r: 191394 b: refs/heads/master c: beac4c7e4a1cc6d57801f690e5e82fa2c9c245c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 850955f3fca9..e8fc45d03cbd 100644 --- 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 index 9357ecdb7f6b..35a5c649638b 100644 --- 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; }