From: Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx> Enable tree_exp.h using some rcu_preempt macros introduced in the next patch. The new macros touch core rcu_preempt fields and are better to be implemented in tree_plugin.h. Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Frederic Weisbecker <frederic@xxxxxxxxxx> Signed-off-by: Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx> --- kernel/rcu/tree.c | 2 +- kernel/rcu/tree_plugin.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index d9642dd06c25..57d1ae26861f 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -5245,6 +5245,6 @@ void __init rcu_init(void) } #include "tree_stall.h" -#include "tree_exp.h" #include "tree_nocb.h" #include "tree_plugin.h" +#include "tree_exp.h" diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index b1264096d03a..d899b4afc21c 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -103,6 +103,7 @@ static void __init rcu_bootup_announce_oddness(void) #ifdef CONFIG_PREEMPT_RCU static void rcu_report_exp_rnp(struct rcu_node *rnp, bool wake); +static bool sync_rcu_exp_done(struct rcu_node *rnp); static void rcu_read_unlock_special(struct task_struct *t); /* -- 2.19.1.6.gb485710b