From 1734e849e8250d9c8bff39b3fb503e2fa48b4ed4 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Thu, 6 Sep 2012 15:38:02 -0700 Subject: [PATCH] --- yaml --- r: 323528 b: refs/heads/master c: b17c7035f37f47c7f7cb08a5555ab2aebfa31f91 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcutree.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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; /*