[PATCH -tip] v3 Merge per-RCU-flavor initialization into pre-existing macro.

From: Paul E. McKenney
Date: Sat Aug 22 2009 - 16:58:12 EST


From: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>

Rename the RCU_DATA_PTR_INIT() macro to RCU_INIT_FLAVOR() and make it
do the rcu_init_one() and rcu_boot_init_percpu_data() calls. Merge
the loop that was in the original macro with the loops that were in
__rcu_init().

Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxxxxxxxxxx>
---
kernel/rcutree.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index 4d71d4e..7c51508 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -1543,8 +1543,9 @@ static void __init rcu_init_one(struct rcu_state *rsp)
* Helper macro for __rcu_init(). To be used nowhere else!
* Assigns leaf node pointers into each CPU's rcu_data structure.
*/
-#define RCU_DATA_PTR_INIT(rsp, rcu_data) \
+#define RCU_INIT_FLAVOR(rsp, rcu_data) \
do { \
+ rcu_init_one(rsp); \
rnp = (rsp)->level[NUM_RCU_LVLS - 1]; \
j = 0; \
for_each_possible_cpu(i) { \
@@ -1552,6 +1553,7 @@ do { \
j++; \
per_cpu(rcu_data, i).mynode = &rnp[j]; \
(rsp)->rda[i] = &per_cpu(rcu_data, i); \
+ rcu_boot_init_percpu_data(i, rsp); \
} \
} while (0)

@@ -1565,14 +1567,8 @@ void __init __rcu_init(void)
#ifdef CONFIG_RCU_CPU_STALL_DETECTOR
printk(KERN_INFO "RCU-based detection of stalled CPUs is enabled.\n");
#endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */
- rcu_init_one(&rcu_sched_state);
- RCU_DATA_PTR_INIT(&rcu_sched_state, rcu_sched_data);
- for_each_possible_cpu(i)
- rcu_boot_init_percpu_data(i, &rcu_sched_state);
- rcu_init_one(&rcu_bh_state);
- RCU_DATA_PTR_INIT(&rcu_bh_state, rcu_bh_data);
- for_each_possible_cpu(i)
- rcu_boot_init_percpu_data(i, &rcu_bh_state);
+ RCU_INIT_FLAVOR(&rcu_sched_state, rcu_sched_data);
+ RCU_INIT_FLAVOR(&rcu_bh_state, rcu_bh_data);
open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);
}

--
1.5.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/