From b741e78a57c1976045827ec931d66d00d6ffde6e Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Tue, 8 May 2012 21:00:28 -0700
Subject: [PATCH] --- yaml --- r: 312159 b: refs/heads/master c:
 cca6f3931920a7547d02e68adc2ca635bea5600c h: refs/heads/master i:   312157:
 59cf2d9de9f47cfafe840e2348f088b05af885e4   312155:
 55e6ad3e865ddd1788722d6439c8a0fa5b709d39   312151:
 40af1d2ab6c7d54cb9d9bb086da0809bc9ead914   312143:
 f3929817eda858c9913db2e8a98adc3b6f65718d   312127:
 f93ed4b5d175706b5782689d611f023fda3b2627 v: v3

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

diff --git a/[refs] b/[refs]
index f1305677105d..08ad92968125 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc5df65b0370fc6aa2bfe3bb19e0451d5cafb99f
+refs/heads/master: cca6f3931920a7547d02e68adc2ca635bea5600c
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
index a4c592b66e10..0fdbc5e07302 100644
--- a/trunk/kernel/rcutree.c
+++ b/trunk/kernel/rcutree.c
@@ -2675,7 +2675,7 @@ static void __init rcu_init_geometry(void)
 {
 	int i;
 	int j;
-	int n = NR_CPUS;
+	int n = nr_cpu_ids;
 	int rcu_capacity[MAX_RCU_LVLS + 1];
 
 	/* If the compile-time values are accurate, just leave. */
diff --git a/trunk/kernel/rcutree_plugin.h b/trunk/kernel/rcutree_plugin.h
index 70e0fd256cc6..ef2b5231afa4 100644
--- a/trunk/kernel/rcutree_plugin.h
+++ b/trunk/kernel/rcutree_plugin.h
@@ -72,6 +72,8 @@ static void __init rcu_bootup_announce_oddness(void)
 #endif
 	if (rcu_fanout_leaf != CONFIG_RCU_FANOUT_LEAF)
 		printk(KERN_INFO "\tExperimental boot-time adjustment of leaf fanout to %d.\n", rcu_fanout_leaf);
+	if (nr_cpu_ids != NR_CPUS)
+		printk(KERN_INFO "\tRCU restricting CPUs from NR_CPUS=%d to nr_cpu_ids=%d.\n", NR_CPUS, nr_cpu_ids);
 }
 
 #ifdef CONFIG_TREE_PREEMPT_RCU