Move rcu_copy_process() into kernel/fork.c, which is the only
user of this inline function.
This simplifies <linux/sched/task.h> to the level that <linux/sched.h>
does not have to be included in it anymore.
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
arch/mips/include/asm/processor.h | 1 -
include/linux/sched/task.h | 21 ++++-----------------
kernel/fork.c | 15 +++++++++++++++
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/arch/mips/include/asm/processor.h
b/arch/mips/include/asm/processor.h
index 461734dea839..95b8c471f572 100644
--- a/arch/mips/include/asm/processor.h
+++ b/arch/mips/include/asm/processor.h
@@ -14,7 +14,6 @@
#include <linux/atomic.h>
#include <linux/cpumask.h>
#include <linux/threads.h>
-#include <linux/sched/task.h>
#include <asm/cachectl.h>
#include <asm/cpu.h>
diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h
index e93638a03515..5cdb7ee3978b 100644
--- a/include/linux/sched/task.h
+++ b/include/linux/sched/task.h
@@ -1,13 +1,15 @@
#ifndef _LINUX_SCHED_TASK_H
#define _LINUX_SCHED_TASK_H
+#include <linux/spinlock.h>
+
+struct task_struct;
+
/*
* Interface between the scheduler and various task lifetime (fork()/exit())
* functionality:
*/
-#include <linux/sched.h>
-
/*
* This serializes "schedule()" and also protects
* the run-queue from deletions/modifications (but
@@ -25,21 +27,6 @@ extern asmlinkage void schedule_tail(struct task_struct
*prev);
extern void init_idle(struct task_struct *idle, int cpu);
extern void init_idle_bootup_task(struct task_struct *idle);
-static inline void rcu_copy_process(struct task_struct *p)
-{
-#ifdef CONFIG_PREEMPT_RCU
- p->rcu_read_lock_nesting = 0;
- p->rcu_read_unlock_special.s = 0;
- p->rcu_blocked_node = NULL;
- INIT_LIST_HEAD(&p->rcu_node_entry);
-#endif /* #ifdef CONFIG_PREEMPT_RCU */
-#ifdef CONFIG_TASKS_RCU
- p->rcu_tasks_holdout = false;
- INIT_LIST_HEAD(&p->rcu_tasks_holdout_list);
- p->rcu_tasks_idle_cpu = -1;
-#endif /* #ifdef CONFIG_TASKS_RCU */
-}
-
extern int sched_fork(unsigned long clone_flags, struct task_struct *p);
extern void sched_dead(struct task_struct *p);
diff --git a/kernel/fork.c b/kernel/fork.c
index 63f2e6e693fa..d5802d7e9bdb 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1462,6 +1462,21 @@ init_task_pid(struct task_struct *task, enum pid_type
type, struct pid *pid)
task->pids[type].pid = pid;
}
+static inline void rcu_copy_process(struct task_struct *p)
+{
+#ifdef CONFIG_PREEMPT_RCU
+ p->rcu_read_lock_nesting = 0;
+ p->rcu_read_unlock_special.s = 0;
+ p->rcu_blocked_node = NULL;
+ INIT_LIST_HEAD(&p->rcu_node_entry);
+#endif /* #ifdef CONFIG_PREEMPT_RCU */
+#ifdef CONFIG_TASKS_RCU
+ p->rcu_tasks_holdout = false;
+ INIT_LIST_HEAD(&p->rcu_tasks_holdout_list);
+ p->rcu_tasks_idle_cpu = -1;
+#endif /* #ifdef CONFIG_TASKS_RCU */
+}
+
/*
* This creates a new process as a copy of the old one,
* but does not actually start it yet.
--
2.7.4
