From 5744373aebf87563f1b0aec1bd995eb9ce22f07a Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 28 Aug 2007 12:53:24 +0200 Subject: [PATCH] --- yaml --- r: 64657 b: refs/heads/master c: 9f508f8258e18e9333f18daf1f0860df48d49ed2 h: refs/heads/master i: 64655: fe75b4b840c072f018d65b68e104e3c39216c9eb v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1b4e09911798..03de0764382d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 213c8af67f21c1dc0d50940b159d9521c95f3c89 +refs/heads/master: 9f508f8258e18e9333f18daf1f0860df48d49ed2 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 75f025da6f7c..ce39282d9c0d 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1108,21 +1108,21 @@ static void task_new_fair(struct rq *rq, struct task_struct *p) * until it reschedules once. We set up the key so that * it will preempt the parent: */ - p->se.fair_key = current->se.fair_key - + se->fair_key = curr->fair_key - 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: */ if (sysctl_sched_features & SCHED_FEAT_SKIP_INITIAL) - p->se.wait_start_fair = 0; + se->wait_start_fair = 0; /* * The statistical average of wait_runtime is about * -granularity/2, so initialize the task with that: */ if (sysctl_sched_features & SCHED_FEAT_START_DEBIT) { - p->se.wait_runtime = -(sched_granularity(cfs_rq) / 2); + se->wait_runtime = -(sched_granularity(cfs_rq) / 2); schedstat_add(cfs_rq, wait_runtime, se->wait_runtime); }