aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/rcu
diff options
context:
space:
mode:
authorPaul E. McKenney <paulmck@kernel.org>2020-03-15 14:51:20 -0700
committerPaul E. McKenney <paulmck@kernel.org>2020-04-27 11:03:51 -0700
commit8fd8ca388ccf233b8ae0b6b42ddc7caa5034ae85 (patch)
tree5ead3eba97e4fb7f0c134d9f066cf24926cc3647 /kernel/rcu
parentrcu-tasks: Add stall warnings for RCU Tasks Trace (diff)
downloadlinux-dev-8fd8ca388ccf233b8ae0b6b42ddc7caa5034ae85.tar.xz
linux-dev-8fd8ca388ccf233b8ae0b6b42ddc7caa5034ae85.zip
rcu-tasks: Move #ifdef into tasks.h
This commit pushes the #ifdef CONFIG_TASKS_RCU_GENERIC from kernel/rcu/update.c to kernel/rcu/tasks.h in order to improve readability as more APIs are added. Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'kernel/rcu')
-rw-r--r--kernel/rcu/tasks.h5
-rw-r--r--kernel/rcu/update.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/kernel/rcu/tasks.h b/kernel/rcu/tasks.h
index 4237881e7780..b7e3e1d28a5c 100644
--- a/kernel/rcu/tasks.h
+++ b/kernel/rcu/tasks.h
@@ -5,6 +5,7 @@
* Copyright (C) 2020 Paul E. McKenney
*/
+#ifdef CONFIG_TASKS_RCU_GENERIC
////////////////////////////////////////////////////////////////////////
//
@@ -984,3 +985,7 @@ core_initcall(rcu_spawn_tasks_trace_kthread);
#else /* #ifdef CONFIG_TASKS_TRACE_RCU */
void exit_tasks_rcu_finish_trace(struct task_struct *t) { }
#endif /* #else #ifdef CONFIG_TASKS_TRACE_RCU */
+
+#else /* #ifdef CONFIG_TASKS_RCU_GENERIC */
+static inline void rcu_tasks_bootup_oddness(void) {}
+#endif /* #else #ifdef CONFIG_TASKS_RCU_GENERIC */
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index 30dce20e1644..c5799349ff31 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -584,11 +584,7 @@ late_initcall(rcu_verify_early_boot_tests);
void rcu_early_boot_tests(void) {}
#endif /* CONFIG_PROVE_RCU */
-#ifdef CONFIG_TASKS_RCU_GENERIC
#include "tasks.h"
-#else /* #ifdef CONFIG_TASKS_RCU_GENERIC */
-static inline void rcu_tasks_bootup_oddness(void) {}
-#endif /* #else #ifdef CONFIG_TASKS_RCU_GENERIC */
#ifndef CONFIG_TINY_RCU