---

yaml --- r: 200596 b: refs/heads/master c: 8695159 h: refs/heads/master v: v3
git-mirror · Jun 23, 2010 · 1bbd776 · 1bbd776
1 parent 304d0be
commit 1bbd776
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94bfa3b6692c7a3f6f119596724204ec975d3ef0
+refs/heads/master: 8695159967957015f8dfb49315d6f88e111d90e0
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -2494,7 +2494,16 @@ void sched_fork(struct task_struct *p, int clone_flags)
 	if (p->sched_class->task_fork)
 		p->sched_class->task_fork(p);
 
+	/*
+	 * The child is not yet in the pid-hash so no cgroup attach races,
+	 * and the cgroup is pinned to this child due to cgroup_fork()
+	 * is ran before sched_fork().
+	 *
+	 * Silence PROVE_RCU.
+	 */
+	rcu_read_lock();
 	set_task_cpu(p, cpu);
+	rcu_read_unlock();
 
 #if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
 	if (likely(sched_info_on()))