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;