summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-03-27 12:11:12 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2013-06-10 16:45:50 -0400
commit58c4e69d43df91fd6a55bc070474aad6b7cfb18d (patch)
treede7c3a6907e47a8feee4c406e86a9176eeddd682
parent47d65935a7f26f24417585e872e254c7ecc6596f (diff)
rcu: Remove rcu_preempt_process_callbacks()
With the removal of CONFIG_TINY_PREEMPT_RCU, rcu_preempt_process_callbacks() is now an empty function. This commit therefore eliminates it by inlining it. Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
-rw-r--r--kernel/rcutiny.c1
-rw-r--r--kernel/rcutiny_plugin.h8
2 files changed, 0 insertions, 9 deletions
diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
index 6f5a2a6cc63f..7fc2339b0859 100644
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
@@ -314,7 +314,6 @@ static void rcu_process_callbacks(struct softirq_action *unused)
314{ 314{
315 __rcu_process_callbacks(&rcu_sched_ctrlblk); 315 __rcu_process_callbacks(&rcu_sched_ctrlblk);
316 __rcu_process_callbacks(&rcu_bh_ctrlblk); 316 __rcu_process_callbacks(&rcu_bh_ctrlblk);
317 rcu_preempt_process_callbacks();
318} 317}
319 318
320/* 319/*
diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
index 8b835b98114c..bfe992407803 100644
--- a/kernel/rcutiny_plugin.h
+++ b/kernel/rcutiny_plugin.h
@@ -102,14 +102,6 @@ static void check_cpu_stalls(void)
102 RCU_TRACE(check_cpu_stall_preempt()); 102 RCU_TRACE(check_cpu_stall_preempt());
103} 103}
104 104
105/*
106 * Because preemptible RCU does not exist, it never has any callbacks
107 * to process.
108 */
109static void rcu_preempt_process_callbacks(void)
110{
111}
112
113/* Hold off callback invocation until early_initcall() time. */ 105/* Hold off callback invocation until early_initcall() time. */
114static int rcu_scheduler_fully_active __read_mostly; 106static int rcu_scheduler_fully_active __read_mostly;
115 107