diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:17:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:17:56 -0800 |
| commit | 2f886464aa00cd9eb9cf46c8c155a24a752bb317 (patch) | |
| tree | 2ba7448086adf0c35ccc34860959ef009b499d62 /kernel/exit.c | |
| parent | fe48f9c8ac1f6b93d8f1371f116a2a0d95d6bc19 (diff) | |
v2.5.2.5 -> v2.5.2.6
- Asit Mallick: mtrr update
- Patrick Mochel: split up kernel/device.c into drivers/base
- Mikael Pettersson/Al Viro: fix missing in-core inode initialization
in ext2 introduced by Al's inode trimming
- David Miller: sparc and network updates
- Frank Davis: firewire video mmap page remapping fix
- me: fix configure help scripts to fix breakage noticed by Dave Jones
- Greg KH: USB updates
- Kai Germaschewski: ISDN fixes, Config.help entries
- Douglas Gilbert: SCSI doc update
- Ingo Molnar: x86 taskswitch optimizations, scheduler updates
- Mikael Pettersson: make APIC work on old external setups
- Al Viro: more inode trimming
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 850d3b7ef12c..429fd2908b46 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -59,6 +59,9 @@ static void release_task(struct task_struct * p) current->time_slice += p->time_slice; if (current->time_slice > MAX_TIMESLICE) current->time_slice = MAX_TIMESLICE; + if (p->sleep_avg < current->sleep_avg) + current->sleep_avg = (current->sleep_avg * EXIT_WEIGHT + + p->sleep_avg) / (EXIT_WEIGHT + 1); __restore_flags(flags); p->pid = 0; |