From 43522927b834baf9baa6a6c612a33f9b9e7db573 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Wed, 5 Sep 2012 21:43:57 -0700
Subject: [PATCH] --- yaml --- r: 323527 b: refs/heads/master c:
 4dbd6bb38dd1cbfa5cb21e56e51dffc74aa20038 h: refs/heads/master i:   323525:
 29b20bf0104ff9e3384ab57a11a75814b6339bed   323523:
 db0313206d9a8cdf608d2a5a897b908dd0e03096   323519:
 c226b2493a32d5dc98baf9c827cdcc1a8970f549 v: v3

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

diff --git a/[refs] b/[refs]
index ec4db8a03bd1..390d04e51ac7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7d6a11e8609f0319d4a2d8ede348f8b3374b652
+refs/heads/master: 4dbd6bb38dd1cbfa5cb21e56e51dffc74aa20038
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
index 6194402ec853..8b9496fee235 100644
--- a/trunk/kernel/rcutree.c
+++ b/trunk/kernel/rcutree.c
@@ -2723,7 +2723,7 @@ static void __init rcu_init_levelspread(struct rcu_state *rsp)
 	int cprv;
 	int i;
 
-	cprv = NR_CPUS;
+	cprv = nr_cpu_ids;
 	for (i = rcu_num_lvls - 1; i >= 0; i--) {
 		ccur = rsp->levelcnt[i];
 		rsp->levelspread[i] = (cprv + ccur - 1) / ccur;