From 47c2e5fc20088536f3bc8aaeeb4701d2be2d8eb2 Mon Sep 17 00:00:00 2001 From: Srivatsa Vaddagiri Date: Wed, 17 Oct 2007 16:55:11 +0200 Subject: [PATCH] --- yaml --- r: 70911 b: refs/heads/master c: b9dca1e0fcb696716840a3bc8f20a6941b484dbf h: refs/heads/master i: 70909: 85a465e65313ac84d5c19b10545aa473fce04ac5 70907: d041d106b6c802cf8638721e38b61d1582287199 70903: 1f87a846e58b774ca7d35860daf7767df0b23212 70895: 2cf81cea37d410701bf8bd05913b8f54d7fa6613 70879: 6a48907a657d241dcf6ea4ac3f6f8336a3c37708 70847: 51c1260184843342b4b27f8381b80126eadfa6cc 70783: 8431834807060a0955a86b212e7c166dfc06b677 70655: 8cebdcc8a85483c6e710809fdb4e9f12dcac0e69 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 2 +- trunk/kernel/sched_fair.c | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 366b37c9cb8a..b34e6cffd6e1 100644 --- 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 index 975436435b42..0ec9521a8e70 100644 --- 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 index a17b785d7000..166ed6db600b 100644 --- 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); }