From fb729acee6a47c885bbc5c96ccf89bad667ad3f5 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Sat, 25 Jun 2011 15:45:46 +0200
Subject: [PATCH] --- yaml --- r: 269176 b: refs/heads/master c:
 4939602a2441306008c6dca38216b741d4e09a42 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6dc75fbf380e..cbdc45e0af47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa17b507f142d37aeac322a95f6f7c6375f25601
+refs/heads/master: 4939602a2441306008c6dca38216b741d4e09a42
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 45174ca5c8ea..ce9a9e7db116 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -6161,10 +6161,9 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
 {
 	if (p->sched_class && p->sched_class->set_cpus_allowed)
 		p->sched_class->set_cpus_allowed(p, new_mask);
-	else {
-		cpumask_copy(&p->cpus_allowed, new_mask);
-		p->rt.nr_cpus_allowed = cpumask_weight(new_mask);
-	}
+
+	cpumask_copy(&p->cpus_allowed, new_mask);
+	p->rt.nr_cpus_allowed = cpumask_weight(new_mask);
 }
 
 /*
diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c
index 57a10842afa1..3023fd1ef364 100644
--- a/trunk/kernel/sched_rt.c
+++ b/trunk/kernel/sched_rt.c
@@ -1608,9 +1608,6 @@ static void set_cpus_allowed_rt(struct task_struct *p,
 
 		update_rt_migration(&rq->rt);
 	}
-
-	cpumask_copy(&p->cpus_allowed, new_mask);
-	p->rt.nr_cpus_allowed = weight;
 }
 
 /* Assumes rq->lock is held */