From 7fe0a1ab7e8da6c60606ec69ca3597f86e06d357 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Sun, 20 Dec 2009 17:36:27 +0100
Subject: [PATCH] --- yaml --- r: 178121 b: refs/heads/master c:
 70f1120527797adb31c68bdc6f1b45e182c342c7 h: refs/heads/master i:   178119:
 b0aa4d1a9417b8503fa09f8662d88d1fb209d972 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9bb36088022c..c80778d86e55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3df0fc5b2e9d8092dcaeb5ae0b6753d85c851d66
+refs/heads/master: 70f1120527797adb31c68bdc6f1b45e182c342c7
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 7ffde2ae7868..87f1f47beffe 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2346,7 +2346,7 @@ int select_task_rq(struct task_struct *p, int sd_flags, int wake_flags)
 	 *   not worry about this generic constraint ]
 	 */
 	if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) ||
-		     !cpu_active(cpu)))
+		     !cpu_online(cpu)))
 		cpu = select_fallback_rq(task_cpu(p), p);
 
 	return cpu;