From 969969a02e14635388cf99557d310b93685d5dc9 Mon Sep 17 00:00:00 2001
From: Kirill Tkhai <tkhai@yandex.ru>
Date: Thu, 31 Jan 2013 18:56:17 +0400
Subject: [PATCH] --- yaml --- r: 350130 b: refs/heads/master c:
 60334caf37dc7c59120b21faa625534a6fffead0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bcdac1ee7ba1..071493d1ef9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc79e240be5aa379dd36a62158be5a5ee0e4aec7
+refs/heads/master: 60334caf37dc7c59120b21faa625534a6fffead0
diff --git a/trunk/kernel/sched/rt.c b/trunk/kernel/sched/rt.c
index 94abca4d9cf5..c25de141c576 100644
--- a/trunk/kernel/sched/rt.c
+++ b/trunk/kernel/sched/rt.c
@@ -1427,8 +1427,7 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p)
 static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu)
 {
 	if (!task_running(rq, p) &&
-	    (cpu < 0 || cpumask_test_cpu(cpu, tsk_cpus_allowed(p))) &&
-	    (p->nr_cpus_allowed > 1))
+	    cpumask_test_cpu(cpu, tsk_cpus_allowed(p)))
 		return 1;
 	return 0;
 }