From 36262d5524a6245175332e05c2f8416ca654f552 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Tue, 30 Mar 2010 18:40:36 +0800
Subject: [PATCH] --- yaml --- r: 190997 b: refs/heads/master c:
 5db356736acb9ba717df1aa9444e4e44cbb30a71 h: refs/heads/master i:   190995:
 949a1c27f66a337644e0c98773c934ef1f416ca4 v: v3

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

diff --git a/[refs] b/[refs]
index b09fe20dc567..ca84f58a5af3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c34029abdfdea64420cb4264c4e91a776b22157
+refs/heads/master: 5db356736acb9ba717df1aa9444e4e44cbb30a71
diff --git a/trunk/kernel/rcutree_plugin.h b/trunk/kernel/rcutree_plugin.h
index 79b53bda8943..687c4e90722e 100644
--- a/trunk/kernel/rcutree_plugin.h
+++ b/trunk/kernel/rcutree_plugin.h
@@ -1016,7 +1016,7 @@ int rcu_needs_cpu(int cpu)
 
 	/* Don't bother unless we are the last non-dyntick-idle CPU. */
 	for_each_cpu_not(thatcpu, nohz_cpu_mask)
-		if (thatcpu != cpu) {
+		if (cpu_online(thatcpu) && thatcpu != cpu) {
 			per_cpu(rcu_dyntick_drain, cpu) = 0;
 			per_cpu(rcu_dyntick_holdoff, cpu) = jiffies - 1;
 			return rcu_needs_cpu_quick_check(cpu);