From: Paul E. McKenney Date: Wed, 27 Mar 2013 16:05:34 +0000 (-0700) Subject: rcu: Remove rcu_preempt_remove_callbacks() X-Git-Tag: next-20130607~35^2~11^5~9 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=86b67d1c60058f20c3ba8175124a2faa37686384;p=karo-tx-linux.git rcu: Remove rcu_preempt_remove_callbacks() With the removal of CONFIG_TINY_PREEMPT_RCU, rcu_preempt_remove_callbacks() is now an empty function. This commit therefore eliminates it by inlining it. Signed-off-by: Paul E. McKenney Reviewed-by: Josh Triplett --- diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c index 91782827775b..6f5a2a6cc63f 100644 --- a/kernel/rcutiny.c +++ b/kernel/rcutiny.c @@ -289,7 +289,6 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp) *rcp->donetail = NULL; if (rcp->curtail == rcp->donetail) rcp->curtail = &rcp->rcucblist; - rcu_preempt_remove_callbacks(rcp); rcp->donetail = &rcp->rcucblist; local_irq_restore(flags); diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h index 404b3a31e517..8b835b98114c 100644 --- a/kernel/rcutiny_plugin.h +++ b/kernel/rcutiny_plugin.h @@ -102,14 +102,6 @@ static void check_cpu_stalls(void) RCU_TRACE(check_cpu_stall_preempt()); } -/* - * Because preemptible RCU does not exist, it never has any callbacks - * to remove. - */ -static void rcu_preempt_remove_callbacks(struct rcu_ctrlblk *rcp) -{ -} - /* * Because preemptible RCU does not exist, it never has any callbacks * to process.