From 44d1a6d51997fde54a3bc60a694f711d21d86129 Mon Sep 17 00:00:00 2001 From: Mike Galbraith Date: Sat, 19 Sep 2009 16:52:35 +0200 Subject: [PATCH] --- yaml --- r: 164321 b: refs/heads/master c: 3f04e8cd5b24727a2500f8ab8f3de730ba47b02c h: refs/heads/master i: 164319: ac2d503becdd7a943fd239f3fe99a4a7e924c3a2 v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c5e1e3547d64..438169cd790d 100644 --- 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 index 29b35a7ec571..566e3bb78ed9 100644 --- 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; }