The following commit has been merged into the core/rcu branch of tip:
Commit-ID: 8fd8ca388ccf233b8ae0b6b42ddc7caa5034ae85
Gitweb: https://git.kernel.org/tip/8fd8ca388ccf233b8ae0b6b42ddc7caa5034ae85
Author: Paul E. McKenney <paulmck@xxxxxxxxxx>
AuthorDate: Sun, 15 Mar 2020 14:51:20 -07:00
Committer: Paul E. McKenney <paulmck@xxxxxxxxxx>
CommitterDate: Mon, 27 Apr 2020 11:03:51 -07:00
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@xxxxxxxxxx>
---
kernel/rcu/tasks.h | 5 +++++
kernel/rcu/update.c | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/rcu/tasks.h b/kernel/rcu/tasks.h
index 4237881..b7e3e1d 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 30dce20..c579934 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
|