---

yaml --- r: 70911 b: refs/heads/master c: b9dca1e h: refs/heads/master i: 70909: 85a465e 70907: d041d10 70903: 1f87a84 70895: 2cf81ce 70879: 6a48907 70847: 51c1260 70783: 8431834 70655: 8cebdcc v: v3
git-mirror · Oct 17, 2007 · 47c2e5f · 47c2e5f
1 parent 233576b
commit 47c2e5f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1a8c172c318534b96d0f0f1aecdad3898118b98
+refs/heads/master: b9dca1e0fcb696716840a3bc8f20a6941b484dbf
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -1712,7 +1712,7 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
 
 	p->prio = effective_prio(p);
 
-	if (!p->sched_class->task_new || !current->se.on_rq || !rq->cfs.curr) {
+	if (!p->sched_class->task_new || !current->se.on_rq) {
 		activate_task(rq, p, 0);
 	} else {
 		/*

diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -1031,12 +1031,8 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
 		swap(curr->vruntime, se->vruntime);
 	}
 
-	update_stats_enqueue(cfs_rq, se);
-	check_spread(cfs_rq, se);
-	check_spread(cfs_rq, curr);
-	__enqueue_entity(cfs_rq, se);
-	account_entity_enqueue(cfs_rq, se);
 	se->peer_preempt = 0;
+	enqueue_task_fair(rq, p, 0);
 	resched_task(rq->curr);
 }