Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7109c4429af3640f79a638f177fc5d05b9807149
Commit:     7109c4429af3640f79a638f177fc5d05b9807149
Parent:     f6cf891c4d7128f9f91243fc0b9ce99e10fa1586
Author:     Ting Yang <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 28 12:53:24 2007 +0200
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Tue Aug 28 12:53:24 2007 +0200

    sched: call update_curr() in task_tick_fair()
    
    update the fair-clock before using it for the key value.
    
    [ [EMAIL PROTECTED]: small cleanups. ]
    
    Signed-off-by: Ting Yang <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Mike Galbraith <[EMAIL PROTECTED]>
    Signed-off-by: Peter Zijlstra <[EMAIL PROTECTED]>
---
 kernel/sched_fair.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 721fe77..9f06094 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1094,10 +1094,11 @@ static void task_tick_fair(struct rq *rq, struct 
task_struct *curr)
 static void task_new_fair(struct rq *rq, struct task_struct *p)
 {
        struct cfs_rq *cfs_rq = task_cfs_rq(p);
-       struct sched_entity *se = &p->se;
+       struct sched_entity *se = &p->se, *curr = cfs_rq_curr(cfs_rq);
 
        sched_info_queued(p);
 
+       update_curr(cfs_rq);
        update_stats_enqueue(cfs_rq, se);
        /*
         * Child runs first: we let it run before the parent
@@ -1105,7 +1106,7 @@ static void task_new_fair(struct rq *rq, struct 
task_struct *p)
         * it will preempt the parent:
         */
        p->se.fair_key = current->se.fair_key -
-               niced_granularity(&rq->curr->se, sched_granularity(cfs_rq)) - 1;
+               niced_granularity(curr, sched_granularity(cfs_rq)) - 1;
        /*
         * The first wait is dominated by the child-runs-first logic,
         * so do not credit it with that waiting time yet:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to