From: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Wed, 27 May 2015 20:00:49 +0000 (-0700)
Subject: Merge branches 'array.2015.05.27a', 'doc.2015.05.27a', 'fixes.2015.05.27a', 'hotplug... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0868aa22167d93dd974c253d259c3e6fd47a16c8;p=linux-beck.git

Merge branches 'array.2015.05.27a', 'doc.2015.05.27a', 'fixes.2015.05.27a', 'hotplug.2015.05.27a', 'init.2015.05.27a', 'tiny.2015.05.27a' and 'torture.2015.05.27a' into HEAD

array.2015.05.27a:  Remove all uses of RCU-protected array indexes.
doc.2015.05.27a:  Docuemntation updates.
fixes.2015.05.27a:  Miscellaneous fixes.
hotplug.2015.05.27a:  CPU-hotplug updates.
init.2015.05.27a:  Initialization/Kconfig updates.
tiny.2015.05.27a:  Updates to Tiny RCU.
torture.2015.05.27a:  Torture-testing updates.
---

0868aa22167d93dd974c253d259c3e6fd47a16c8
diff --cc kernel/rcu/tree.c
index 0628df155970,0628df155970,7b9dd4f62569,d198a33d54bd,991fa5c5dc5e,0628df155970,0628df155970..add042926a66
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@@@@@@ -110,11 -110,11 -110,12 -110,11 -110,17 -110,11 -110,11 +110,18 @@@@@@@@ struct rcu_state sname##_state = { 
       RCU_STATE_INITIALIZER(rcu_sched, 's', call_rcu_sched);
       RCU_STATE_INITIALIZER(rcu_bh, 'b', call_rcu_bh);
       
-- ----static struct rcu_state *rcu_state_p;
++ ++++static struct rcu_state *const rcu_state_p;
++ ++++static struct rcu_data __percpu *const rcu_data_p;
       LIST_HEAD(rcu_struct_flavors);
       
---- --/* Increase (but not decrease) the CONFIG_RCU_FANOUT_LEAF at boot time. */
---- --static int rcu_fanout_leaf = CONFIG_RCU_FANOUT_LEAF;
++++ ++/* Dump rcu_node combining tree at boot to verify correct setup. */
++++ ++static bool dump_tree;
++++ ++module_param(dump_tree, bool, 0444);
++++ ++/* Control rcu_node-tree auto-balancing at boot time. */
++++ ++static bool rcu_fanout_exact;
++++ ++module_param(rcu_fanout_exact, bool, 0444);
++++ ++/* Increase (but not decrease) the RCU_FANOUT_LEAF at boot time. */
++++ ++static int rcu_fanout_leaf = RCU_FANOUT_LEAF;
       module_param(rcu_fanout_leaf, int, 0444);
       int rcu_num_lvls __read_mostly = RCU_NUM_LVLS;
       static int num_rcu_lvl[] = {  /* Number of rcu_nodes at specified level. */