From 6fce54547092e02cff5fc223c697d9df4a3d53ed Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Mon, 10 Jul 2006 04:43:51 -0700 Subject: [PATCH] --- yaml --- r: 32208 b: refs/heads/master c: 0a565f7919cfb3d3df2c97d45751cbb83d858f97 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf15a54fc312..34204f57755d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e45b3b6af09dab2a28a7c88b340d0bcdd173e068 +refs/heads/master: 0a565f7919cfb3d3df2c97d45751cbb83d858f97 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 4ee400f9d56b..b47819b676fa 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -4877,7 +4877,7 @@ static int __migrate_task(struct task_struct *p, int src_cpu, int dest_cpu) p->timestamp = p->timestamp - rq_src->timestamp_last_tick + rq_dest->timestamp_last_tick; deactivate_task(p, rq_src); - activate_task(p, rq_dest, 0); + __activate_task(p, rq_dest); if (TASK_PREEMPTS_CURR(p, rq_dest)) resched_task(rq_dest->curr); }