From a55d4865dc78cb73edbaefe29c565b9592104928 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimura Date: Thu, 15 Dec 2011 14:36:55 +0900 Subject: [PATCH] --- yaml --- r: 277409 b: refs/heads/master c: 4fc420c91f53e0a9f95665c6b14a1983716081e7 h: refs/heads/master i: 277407: 6f115b40aff3c0539f46abce4e64fb6f28cc0dd6 v: v3 --- [refs] | 2 +- trunk/kernel/sched/fair.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c0f9eb8c234..858966d67bda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11534ec5b6cea13ae38d31799d2a5290c5d724af +refs/heads/master: 4fc420c91f53e0a9f95665c6b14a1983716081e7 diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c index cea2fa853274..525d69e5fb78 100644 --- a/trunk/kernel/sched/fair.c +++ b/trunk/kernel/sched/fair.c @@ -5190,8 +5190,8 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued) */ static void task_fork_fair(struct task_struct *p) { - struct cfs_rq *cfs_rq = task_cfs_rq(current); - struct sched_entity *se = &p->se, *curr = cfs_rq->curr; + struct cfs_rq *cfs_rq; + struct sched_entity *se = &p->se, *curr; int this_cpu = smp_processor_id(); struct rq *rq = this_rq(); unsigned long flags; @@ -5200,6 +5200,9 @@ static void task_fork_fair(struct task_struct *p) update_rq_clock(rq); + cfs_rq = task_cfs_rq(current); + curr = cfs_rq->curr; + if (unlikely(task_cpu(p) != this_cpu)) { rcu_read_lock(); __set_task_cpu(p, this_cpu);