---

yaml --- r: 163013 b: refs/heads/master c: a7558e0 h: refs/heads/master i: 163011: c6aa321 v: v3
git-mirror · Sep 15, 2009 · 3a98491 · 3a98491
1 parent ebdca3d
commit 3a98491
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d47872146398dbede13223299fe1cb368ebc781
+refs/heads/master: a7558e01056f5191ff2ecff53b075dcb9e484188
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -1028,6 +1028,7 @@ struct sched_domain;
  * wake flags
  */
 #define WF_SYNC		0x01		/* waker goes to sleep after wakup */
+#define WF_FORK		0x02		/* child wakeup after fork */
 
 struct sched_class {
 	const struct sched_class *next;

diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -2602,7 +2602,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
 		inc_nr_running(rq);
 	}
 	trace_sched_wakeup_new(rq, p, 1);
-	check_preempt_curr(rq, p, 0);
+	check_preempt_curr(rq, p, WF_FORK);
 #ifdef CONFIG_SMP
 	if (p->sched_class->task_wake_up)
 		p->sched_class->task_wake_up(rq, p);

diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -1580,7 +1580,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int flags
 	 */
 	if (sched_feat(LAST_BUDDY) && likely(se->on_rq && curr != rq->idle))
 		set_last_buddy(se);
-	if (sched_feat(NEXT_BUDDY))
+	if (sched_feat(NEXT_BUDDY) && !(flags & WF_FORK))
 		set_next_buddy(pse);
 
 	/*