diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:37:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:37:24 -0500 |
| commit | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (patch) | |
| tree | cb30b4e80f37e0d734a826aa6b29394f46123f9f /kernel/sched.c | |
| parent | 96a71d52bb91d9b386a60f904956420f98946dd3 (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
Merge branch 'master'
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 340dd238c16d..b4f4eb613537 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -1468,7 +1468,7 @@ void fastcall sched_exit(task_t *p) | |||
| 1468 | * the sleep_avg of the parent as well. | 1468 | * the sleep_avg of the parent as well. |
| 1469 | */ | 1469 | */ |
| 1470 | rq = task_rq_lock(p->parent, &flags); | 1470 | rq = task_rq_lock(p->parent, &flags); |
| 1471 | if (p->first_time_slice) { | 1471 | if (p->first_time_slice && task_cpu(p) == task_cpu(p->parent)) { |
| 1472 | p->parent->time_slice += p->time_slice; | 1472 | p->parent->time_slice += p->time_slice; |
| 1473 | if (unlikely(p->parent->time_slice > task_timeslice(p))) | 1473 | if (unlikely(p->parent->time_slice > task_timeslice(p))) |
| 1474 | p->parent->time_slice = task_timeslice(p); | 1474 | p->parent->time_slice = task_timeslice(p); |
