rcu: move some code from macro to function
Shrink the RCU_INIT_FLAVOR() macro by moving all but the initialization of the ->rda[] array to rcu_init_one(). The call to rcu_init_one() can then be moved to the end of the RCU_INIT_FLAVOR() macro, which is required because rcu_boot_init_percpu_data(), which is now called from rcu_init_one(), depends on the initialization of the ->rda[] array. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
This commit is contained in:
parent
f261414f0d
commit
0c34029abd
|
@ -1859,6 +1859,14 @@ static void __init rcu_init_one(struct rcu_state *rsp)
|
||||||
INIT_LIST_HEAD(&rnp->blocked_tasks[3]);
|
INIT_LIST_HEAD(&rnp->blocked_tasks[3]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rnp = rsp->level[NUM_RCU_LVLS - 1];
|
||||||
|
for_each_possible_cpu(i) {
|
||||||
|
if (i > rnp->grphi)
|
||||||
|
rnp++;
|
||||||
|
rsp->rda[i]->mynode = rnp;
|
||||||
|
rcu_boot_init_percpu_data(i, rsp);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1869,19 +1877,11 @@ static void __init rcu_init_one(struct rcu_state *rsp)
|
||||||
#define RCU_INIT_FLAVOR(rsp, rcu_data) \
|
#define RCU_INIT_FLAVOR(rsp, rcu_data) \
|
||||||
do { \
|
do { \
|
||||||
int i; \
|
int i; \
|
||||||
int j; \
|
|
||||||
struct rcu_node *rnp; \
|
|
||||||
\
|
\
|
||||||
rcu_init_one(rsp); \
|
|
||||||
rnp = (rsp)->level[NUM_RCU_LVLS - 1]; \
|
|
||||||
j = 0; \
|
|
||||||
for_each_possible_cpu(i) { \
|
for_each_possible_cpu(i) { \
|
||||||
if (i > rnp[j].grphi) \
|
|
||||||
j++; \
|
|
||||||
per_cpu(rcu_data, i).mynode = &rnp[j]; \
|
|
||||||
(rsp)->rda[i] = &per_cpu(rcu_data, i); \
|
(rsp)->rda[i] = &per_cpu(rcu_data, i); \
|
||||||
rcu_boot_init_percpu_data(i, rsp); \
|
|
||||||
} \
|
} \
|
||||||
|
rcu_init_one(rsp); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
void __init rcu_init(void)
|
void __init rcu_init(void)
|
||||||
|
|
Loading…
Reference in New Issue