Consolidation of the RCU flavors into one makes increment_cpu_stall_ticks() a trivial one-line function with only one caller. This commit therefore inlines it.
Signed-off-by: Paul E. McKenney <[email protected]> --- kernel/rcu/tree.c | 2 +- kernel/rcu/tree.h | 1 - kernel/rcu/tree_plugin.h | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 91f5d612502a..35a4346c7cce 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c @@ -2554,7 +2554,7 @@ static void rcu_do_batch(struct rcu_data *rdp) void rcu_check_callbacks(int user) { trace_rcu_utilization(TPS("Start scheduler-tick")); - increment_cpu_stall_ticks(); + raw_cpu_inc(rcu_data.ticks_this_gp); rcu_flavor_check_callbacks(user); if (rcu_pending()) invoke_rcu_core(); diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h index 8abc15c42d84..46452d3d0fad 100644 --- a/kernel/rcu/tree.h +++ b/kernel/rcu/tree.h @@ -466,7 +466,6 @@ static void print_cpu_stall_info_begin(void); static void print_cpu_stall_info(int cpu); static void print_cpu_stall_info_end(void); static void zero_cpu_stall_ticks(struct rcu_data *rdp); -static void increment_cpu_stall_ticks(void); static bool rcu_nocb_cpu_needs_barrier(int cpu); static struct swait_queue_head *rcu_nocb_gp_get(struct rcu_node *rnp); static void rcu_nocb_gp_cleanup(struct swait_queue_head *sq); diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 878a1d2cd465..cd276c46bc14 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h @@ -1815,12 +1815,6 @@ static void zero_cpu_stall_ticks(struct rcu_data *rdp) rdp->softirq_snap = kstat_softirqs_cpu(RCU_SOFTIRQ, smp_processor_id()); } -/* Increment ->ticks_this_gp for all flavors of RCU. */ -static void increment_cpu_stall_ticks(void) -{ - raw_cpu_inc(rcu_data.ticks_this_gp); -} - #ifdef CONFIG_RCU_NOCB_CPU /* -- 2.17.1
