diff --git a/[refs] b/[refs]
index 390d04e51ac7..71774a49e571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dbd6bb38dd1cbfa5cb21e56e51dffc74aa20038
+refs/heads/master: b17c7035f37f47c7f7cb08a5555ab2aebfa31f91
diff --git a/trunk/kernel/rcutree.c b/trunk/kernel/rcutree.c
index 8b9496fee235..b703989148e4 100644
--- a/trunk/kernel/rcutree.c
+++ b/trunk/kernel/rcutree.c
@@ -2821,7 +2821,8 @@ static void __init rcu_init_geometry(void)
 	int rcu_capacity[MAX_RCU_LVLS + 1];
 
 	/* If the compile-time values are accurate, just leave. */
-	if (rcu_fanout_leaf == CONFIG_RCU_FANOUT_LEAF)
+	if (rcu_fanout_leaf == CONFIG_RCU_FANOUT_LEAF &&
+	    nr_cpu_ids == NR_CPUS)
 		return;
 
 	/*