From 146316b67610ec99e1304a5d2ced45fac227771d Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 1 Dec 2009 12:21:47 +0100
Subject: [PATCH] --- yaml --- r: 175587 b: refs/heads/master c:
 fb58bac5c75bfff8bbf7d02071a10a62f32fe28b h: refs/heads/master i:   175585:
 693ff811e7f8863313de42e694500f798d696ea2   175583:
 458168ce8429745bc64921ad7b58f97eceeface5 v: v3

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

diff --git a/[refs] b/[refs]
index 888aad8be482..98d738739ab9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cecd084d0fd27bb1e498e2829fd45846d806856
+refs/heads/master: fb58bac5c75bfff8bbf7d02071a10a62f32fe28b
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index e9f5daee12c7..c163a285bf05 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -1403,7 +1403,6 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag
 		new_cpu = prev_cpu;
 	}
 
-	rcu_read_lock();
 	for_each_domain(cpu, tmp) {
 		/*
 		 * If power savings logic is enabled for a domain, see if we
@@ -1484,10 +1483,8 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag
 			update_shares(tmp);
 	}
 
-	if (affine_sd && wake_affine(affine_sd, p, sync)) {
-		new_cpu = cpu;
-		goto out;
-	}
+	if (affine_sd && wake_affine(affine_sd, p, sync))
+		return cpu;
 
 	while (sd) {
 		int load_idx = sd->forkexec_idx;
@@ -1528,8 +1525,6 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flag
 		/* while loop will break here if sd == NULL */
 	}
 
-out:
-	rcu_read_unlock();
 	return new_cpu;
 }
 #endif /* CONFIG_SMP */