From e17d6bc2c102b5081df49a61001e50350da8bc87 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 18 Apr 2011 11:24:34 +0200
Subject: [PATCH] --- yaml --- r: 245594 b: refs/heads/master c:
 057f3fadb347e9c51b07e1b277bbdda79f976768 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 58c04e56c6a6..2ae1b41e91c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f36825b176f67e5c5228aa33d828bc39718811f
+refs/heads/master: 057f3fadb347e9c51b07e1b277bbdda79f976768
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 0cfe0310ed5d..27d3e73a2af6 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1208,11 +1208,17 @@ int get_nohz_timer_target(void)
 	int i;
 	struct sched_domain *sd;
 
+	rcu_read_lock();
 	for_each_domain(cpu, sd) {
-		for_each_cpu(i, sched_domain_span(sd))
-			if (!idle_cpu(i))
-				return i;
+		for_each_cpu(i, sched_domain_span(sd)) {
+			if (!idle_cpu(i)) {
+				cpu = i;
+				goto unlock;
+			}
+		}
 	}
+unlock:
+	rcu_read_unlock();
 	return cpu;
 }
 /*
@@ -2415,12 +2421,14 @@ ttwu_stat(struct task_struct *p, int cpu, int wake_flags)
 		struct sched_domain *sd;
 
 		schedstat_inc(p, se.statistics.nr_wakeups_remote);
+		rcu_read_lock();
 		for_each_domain(this_cpu, sd) {
 			if (cpumask_test_cpu(cpu, sched_domain_span(sd))) {
 				schedstat_inc(sd, ttwu_wake_remote);
 				break;
 			}
 		}
+		rcu_read_unlock();
 	}
 #endif /* CONFIG_SMP */